X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fringbuffer%2Ffrontend_api.h;h=23118c46d98d8cbfa424131e4ca9454ab2e89254;hb=cc62f29ec5d5149ae6dba1a9acb538e06da07a94;hp=ff6abce93d684a86e48066ed7fc537a2516fe9b4;hpb=7915e163192dc9674bcd7ce80338d9d8ebf23d4c;p=lttng-modules.git

diff --git a/lib/ringbuffer/frontend_api.h b/lib/ringbuffer/frontend_api.h
index ff6abce9..23118c46 100644
--- a/lib/ringbuffer/frontend_api.h
+++ b/lib/ringbuffer/frontend_api.h
@@ -29,7 +29,8 @@
  * See linux/ringbuffer/frontend.h for channel allocation and read-side API.
  */
 
-#include "../../wrapper/ringbuffer/frontend.h"
+#include <wrapper/ringbuffer/frontend.h>
+#include <wrapper/percpu-defs.h>
 #include <linux/errno.h>
 #include <linux/prefetch.h>
 
@@ -73,7 +74,7 @@ static inline
 void lib_ring_buffer_put_cpu(const struct lib_ring_buffer_config *config)
 {
 	barrier();
-	__get_cpu_var(lib_ring_buffer_nesting)--;
+	(*lttng_this_cpu_ptr(&lib_ring_buffer_nesting))--;
 	rcu_read_unlock_sched_notrace();
 }
 
@@ -86,6 +87,7 @@ void lib_ring_buffer_put_cpu(const struct lib_ring_buffer_config *config)
 static inline
 int lib_ring_buffer_try_reserve(const struct lib_ring_buffer_config *config,
 				struct 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)
 {
@@ -112,7 +114,7 @@ int lib_ring_buffer_try_reserve(const struct lib_ring_buffer_config *config,
 		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;
@@ -154,28 +156,29 @@ int lib_ring_buffer_try_reserve(const struct lib_ring_buffer_config *config,
 
 static inline
 int lib_ring_buffer_reserve(const struct lib_ring_buffer_config *config,
-			    struct lib_ring_buffer_ctx *ctx)
+			    struct lib_ring_buffer_ctx *ctx,
+			    void *client_ctx)
 {
 	struct channel *chan = ctx->chan;
 	struct lib_ring_buffer *buf;
 	unsigned long o_begin, o_end, o_old;
 	size_t before_hdr_pad = 0;
 
-	if (atomic_read(&chan->record_disabled))
+	if (unlikely(atomic_read(&chan->record_disabled)))
 		return -EAGAIN;
 
 	if (config->alloc == RING_BUFFER_ALLOC_PER_CPU)
 		buf = per_cpu_ptr(chan->backend.buf, ctx->cpu);
 	else
 		buf = chan->backend.buf;
-	if (atomic_read(&buf->record_disabled))
+	if (unlikely(atomic_read(&buf->record_disabled)))
 		return -EAGAIN;
 	ctx->buf = buf;
 
 	/*
 	 * Perform retryable operations.
 	 */
-	if (unlikely(lib_ring_buffer_try_reserve(config, ctx, &o_begin,
+	if (unlikely(lib_ring_buffer_try_reserve(config, ctx, client_ctx, &o_begin,
 						 &o_end, &o_old, &before_hdr_pad)))
 		goto slow_path;
 
@@ -206,7 +209,7 @@ int lib_ring_buffer_reserve(const struct lib_ring_buffer_config *config,
 	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);
 }
 
 /**
@@ -249,6 +252,7 @@ void lib_ring_buffer_commit(const struct lib_ring_buffer_config *config,
 	unsigned long offset_end = ctx->buf_offset;
 	unsigned long endidx = subbuf_index(offset_end - 1, chan);
 	unsigned long commit_count;
+	struct commit_counters_hot *cc_hot = &buf->commit_hot[endidx];
 
 	/*
 	 * Must count record before incrementing the commit count.
@@ -269,7 +273,7 @@ void lib_ring_buffer_commit(const struct lib_ring_buffer_config *config,
 	} else
 		smp_wmb();
 
-	v_add(config, ctx->slot_size, &buf->commit_hot[endidx].cc);
+	v_add(config, ctx->slot_size, &cc_hot->cc);
 
 	/*
 	 * commit count read can race with concurrent OOO commit count updates.
@@ -289,7 +293,7 @@ void lib_ring_buffer_commit(const struct lib_ring_buffer_config *config,
 	 *   count reaches back the reserve offset for a specific sub-buffer,
 	 *   which is completely independent of the order.
 	 */
-	commit_count = v_read(config, &buf->commit_hot[endidx].cc);
+	commit_count = v_read(config, &cc_hot->cc);
 
 	lib_ring_buffer_check_deliver(config, buf, chan, offset_end - 1,
 				      commit_count, endidx, ctx->tsc);
@@ -297,8 +301,8 @@ void lib_ring_buffer_commit(const struct lib_ring_buffer_config *config,
 	 * 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,
-			offset_end, commit_count);
+	lib_ring_buffer_write_commit_counter(config, buf, chan,
+			offset_end, commit_count, cc_hot);
 }
 
 /**