X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Ffrontend_api.h;h=bc1fd1220ba97c21da824ac326d81d4edf789a8a;hb=6c737d0594cac0d969e1948ea1ed55c15be9cec8;hp=eea2a8db579686995d1c204995fdb4dcda51668b;hpb=d2fe4771f15b6e50969bea1d7fcd74edca307de3;p=lttng-ust.git

diff --git a/libringbuffer/frontend_api.h b/libringbuffer/frontend_api.h
index eea2a8db..bc1fd122 100644
--- a/libringbuffer/frontend_api.h
+++ b/libringbuffer/frontend_api.h
@@ -84,6 +84,7 @@ void lib_ring_buffer_put_cpu(const struct lttng_ust_lib_ring_buffer_config *conf
 static inline
 int lib_ring_buffer_try_reserve(const struct lttng_ust_lib_ring_buffer_config *config,
 				struct lttng_ust_lib_ring_buffer_ctx *ctx,
+				void *client_ctx,
 				unsigned long *o_begin, unsigned long *o_end,
 				unsigned long *o_old, size_t *before_hdr_pad)
 {
@@ -110,7 +111,7 @@ int lib_ring_buffer_try_reserve(const struct lttng_ust_lib_ring_buffer_config *c
 		return 1;
 
 	ctx->slot_size = record_header_size(config, chan, *o_begin,
-					    before_hdr_pad, ctx);
+					    before_hdr_pad, ctx, client_ctx);
 	ctx->slot_size +=
 		lib_ring_buffer_align(*o_begin + ctx->slot_size,
 				      ctx->largest_align) + ctx->data_size;
@@ -152,7 +153,8 @@ int lib_ring_buffer_try_reserve(const struct lttng_ust_lib_ring_buffer_config *c
 
 static inline
 int lib_ring_buffer_reserve(const struct lttng_ust_lib_ring_buffer_config *config,
-			    struct lttng_ust_lib_ring_buffer_ctx *ctx)
+			    struct lttng_ust_lib_ring_buffer_ctx *ctx,
+			    void *client_ctx)
 {
 	struct channel *chan = ctx->chan;
 	struct lttng_ust_shm_handle *handle = ctx->handle;
@@ -167,6 +169,8 @@ int lib_ring_buffer_reserve(const struct lttng_ust_lib_ring_buffer_config *confi
 		buf = shmp(handle, chan->backend.buf[ctx->cpu].shmp);
 	else
 		buf = shmp(handle, chan->backend.buf[0].shmp);
+	if (caa_unlikely(!buf))
+		return -EIO;
 	if (caa_unlikely(uatomic_read(&buf->record_disabled)))
 		return -EAGAIN;
 	ctx->buf = buf;
@@ -174,7 +178,7 @@ int lib_ring_buffer_reserve(const struct lttng_ust_lib_ring_buffer_config *confi
 	/*
 	 * Perform retryable operations.
 	 */
-	if (caa_unlikely(lib_ring_buffer_try_reserve(config, ctx, &o_begin,
+	if (caa_unlikely(lib_ring_buffer_try_reserve(config, ctx, client_ctx, &o_begin,
 						 &o_end, &o_old, &before_hdr_pad)))
 		goto slow_path;
 
@@ -205,7 +209,7 @@ int lib_ring_buffer_reserve(const struct lttng_ust_lib_ring_buffer_config *confi
 	ctx->buf_offset = o_begin + before_hdr_pad;
 	return 0;
 slow_path:
-	return lib_ring_buffer_reserve_slow(ctx);
+	return lib_ring_buffer_reserve_slow(ctx, client_ctx);
 }
 
 /**
@@ -253,10 +257,13 @@ void lib_ring_buffer_commit(const struct lttng_ust_lib_ring_buffer_config *confi
 	struct commit_counters_hot *cc_hot = shmp_index(handle,
 						buf->commit_hot, endidx);
 
+	if (caa_unlikely(!cc_hot))
+		return;
+
 	/*
 	 * Must count record before incrementing the commit count.
 	 */
-	subbuffer_count_record(config, &buf->backend, endidx, handle);
+	subbuffer_count_record(config, ctx, &buf->backend, endidx, handle);
 
 	/*
 	 * Order all writes to buffer before the commit count update that will