X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Ffrontend_api.h;h=8c0b76868a63040943ab3154a4d246b772753271;hb=8f62fbe3204b1f7c6c91401c38f2d30cfc644906;hp=a2a9af39aea777998c5d96cdde5f632f500c8cf7;hpb=1ad21f709e7e1537b4cd771f5def29adb404194a;p=lttng-ust.git diff --git a/libringbuffer/frontend_api.h b/libringbuffer/frontend_api.h index a2a9af39..8c0b7686 100644 --- a/libringbuffer/frontend_api.h +++ b/libringbuffer/frontend_api.h @@ -61,7 +61,6 @@ int lib_ring_buffer_get_cpu(const struct lttng_ust_lib_ring_buffer_config *confi if (caa_unlikely(nesting > 4)) { WARN_ON_ONCE(1); URCU_TLS(lib_ring_buffer_nesting)--; - rcu_read_unlock(); return -EPERM; } else return cpu; @@ -288,14 +287,13 @@ void lib_ring_buffer_commit(const struct lttng_ust_lib_ring_buffer_config *confi commit_count = v_read(config, &shmp_index(handle, buf->commit_hot, endidx)->cc); lib_ring_buffer_check_deliver(config, buf, chan, offset_end - 1, - commit_count, endidx, handle); + commit_count, endidx, handle, ctx->tsc); /* * Update used size at each commit. It's needed only for extracting * ring_buffer buffers from vmcore, after crash. */ lib_ring_buffer_write_commit_counter(config, buf, chan, endidx, - ctx->buf_offset, commit_count, - ctx->slot_size, handle); + offset_end, commit_count, handle); } /**