X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Ffrontend_internal.h;h=323a8df7f98cd7e5d3aba69302c6c291799b8bbd;hb=b33b46f7161604cb9168e9bbc854413cf18269be;hp=10d6c4db789bbf498e3188a1a339c5e94223653f;hpb=d2fe4771f15b6e50969bea1d7fcd74edca307de3;p=lttng-ust.git

diff --git a/libringbuffer/frontend_internal.h b/libringbuffer/frontend_internal.h
index 10d6c4db..323a8df7 100644
--- a/libringbuffer/frontend_internal.h
+++ b/libringbuffer/frontend_internal.h
@@ -158,7 +158,8 @@ int last_tsc_overflow(const struct lttng_ust_lib_ring_buffer_config *config,
 #endif
 
 extern
-int lib_ring_buffer_reserve_slow(struct lttng_ust_lib_ring_buffer_ctx *ctx);
+int lib_ring_buffer_reserve_slow(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+		void *client_ctx);
 
 extern
 void lib_ring_buffer_switch_slow(struct lttng_ust_lib_ring_buffer *buf,
@@ -233,10 +234,14 @@ int lib_ring_buffer_reserve_committed(const struct lttng_ust_lib_ring_buffer_con
 				      struct lttng_ust_shm_handle *handle)
 {
 	unsigned long offset, idx, commit_count;
+	struct commit_counters_hot *cc_hot = shmp_index(handle, buf->commit_hot, idx);
 
 	CHAN_WARN_ON(chan, config->alloc != RING_BUFFER_ALLOC_PER_CPU);
 	CHAN_WARN_ON(chan, config->sync != RING_BUFFER_SYNC_PER_CPU);
 
+	if (caa_unlikely(!cc_hot))
+		return 0;
+
 	/*
 	 * Read offset and commit count in a loop so they are both read
 	 * atomically wrt interrupts. By deal with interrupt concurrency by
@@ -248,7 +253,7 @@ int lib_ring_buffer_reserve_committed(const struct lttng_ust_lib_ring_buffer_con
 	do {
 		offset = v_read(config, &buf->offset);
 		idx = subbuf_index(offset, chan);
-		commit_count = v_read(config, &shmp_index(handle, buf->commit_hot, idx)->cc);
+		commit_count = v_read(config, &cc_hot->cc);
 	} while (offset != v_read(config, &buf->offset));
 
 	return ((buf_trunc(offset, chan) >> chan->backend.num_subbuf_order)