X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=include%2Flttng%2Fringbuffer-context.h;h=228bc8aa5b6b35d322b0446408e0ac2e9604e556;hb=3b5babf8592ca27acaf01fca24406922fc5cc89c;hp=e42c3f52e128f3b591e5547e50d9ade32c4287e2;hpb=3d3a2bb817fcab854dc3a90dd80e073869bbccb4;p=lttng-ust.git

diff --git a/include/lttng/ringbuffer-context.h b/include/lttng/ringbuffer-context.h
index e42c3f52..228bc8aa 100644
--- a/include/lttng/ringbuffer-context.h
+++ b/include/lttng/ringbuffer-context.h
@@ -22,7 +22,6 @@
 struct lttng_ust_lib_ring_buffer;
 struct lttng_ust_lib_ring_buffer_channel;
 struct lttng_ust_lib_ring_buffer_ctx;
-struct lttng_ust_shm_handle;
 
 /*
  * ring buffer context
@@ -45,15 +44,14 @@ struct lttng_ust_lib_ring_buffer_ctx {
 	/* input received by lib_ring_buffer_reserve(), saved here. */
 	struct lttng_ust_lib_ring_buffer_channel *chan; /* channel */
 	void *priv;			/* client private data */
-	struct lttng_ust_shm_handle *handle;	/* shared-memory handle */
 	size_t data_size;		/* size of payload */
 	int largest_align;		/*
 					 * alignment of the largest element
 					 * in the payload
 					 */
-	int cpu;			/* processor id */
 
 	/* output from lib_ring_buffer_reserve() */
+	int reserve_cpu;		/* processor id updated by the reserve */
 	struct lttng_ust_lib_ring_buffer *buf;	/*
 					 * buffer corresponding to processor id
 					 * for this channel
@@ -81,27 +79,23 @@ struct lttng_ust_lib_ring_buffer_ctx {
  * @priv: client private data
  * @data_size: size of record data payload
  * @largest_align: largest alignment within data payload types
- * @cpu: processor id
  */
 static inline lttng_ust_notrace
 void lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 			      struct lttng_ust_lib_ring_buffer_channel *chan,
-			      void *priv, size_t data_size, int largest_align,
-			      int cpu, struct lttng_ust_shm_handle *handle);
+			      void *priv, size_t data_size, int largest_align);
 static inline
 void lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 			      struct lttng_ust_lib_ring_buffer_channel *chan,
-			      void *priv, size_t data_size, int largest_align,
-			      int cpu, struct lttng_ust_shm_handle *handle)
+			      void *priv, size_t data_size, int largest_align)
 {
 	ctx->struct_size = sizeof(struct lttng_ust_lib_ring_buffer_ctx);
 	ctx->chan = chan;
 	ctx->priv = priv;
 	ctx->data_size = data_size;
+	ctx->reserve_cpu = -1;
 	ctx->largest_align = largest_align;
-	ctx->cpu = cpu;
 	ctx->rflags = 0;
-	ctx->handle = handle;
 	ctx->ip = 0;
 }