X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fbackend_internal.h;h=0e5e7940c30efb0cb51b00f5ebf8e21a134b0bc3;hb=1d18d519668cd559dcafa1f18113edceb2418ed0;hp=3bd588b9f891a6f500f38e79f21b5d5a65741b3a;hpb=b4c8bf2f2320b7a2d19dec6addda5d6d2aa227a3;p=lttng-ust.git

diff --git a/libringbuffer/backend_internal.h b/libringbuffer/backend_internal.h
index 3bd588b9..0e5e7940 100644
--- a/libringbuffer/backend_internal.h
+++ b/libringbuffer/backend_internal.h
@@ -24,48 +24,48 @@
 
 /* Ring buffer and channel backend create/free */
 
-__attribute__((visibility("hidden")))
 int lib_ring_buffer_backend_create(struct lttng_ust_lib_ring_buffer_backend *bufb,
 				   struct channel_backend *chan,
 				   int cpu,
 				   struct lttng_ust_shm_handle *handle,
-				   struct shm_object *shmobj);
+				   struct shm_object *shmobj)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
-void channel_backend_unregister_notifiers(struct channel_backend *chanb);
+void channel_backend_unregister_notifiers(struct channel_backend *chanb)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
-void lib_ring_buffer_backend_free(struct lttng_ust_lib_ring_buffer_backend *bufb);
+void lib_ring_buffer_backend_free(struct lttng_ust_lib_ring_buffer_backend *bufb)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
 int channel_backend_init(struct channel_backend *chanb,
 			 const char *name,
 			 const struct lttng_ust_lib_ring_buffer_config *config,
 			 size_t subbuf_size,
 			 size_t num_subbuf, struct lttng_ust_shm_handle *handle,
-			 const int *stream_fds);
+			 const int *stream_fds)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
 void channel_backend_free(struct channel_backend *chanb,
-			  struct lttng_ust_shm_handle *handle);
+			  struct lttng_ust_shm_handle *handle)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
 void lib_ring_buffer_backend_reset(struct lttng_ust_lib_ring_buffer_backend *bufb,
-				   struct lttng_ust_shm_handle *handle);
+				   struct lttng_ust_shm_handle *handle)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
-void channel_backend_reset(struct channel_backend *chanb);
+void channel_backend_reset(struct channel_backend *chanb)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
-int lib_ring_buffer_backend_init(void);
+int lib_ring_buffer_backend_init(void)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
-void lib_ring_buffer_backend_exit(void);
+void lib_ring_buffer_backend_exit(void)
+	__attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
 extern void _lib_ring_buffer_write(struct lttng_ust_lib_ring_buffer_backend *bufb,
 				   size_t offset, const void *src, size_t len,
-				   ssize_t pagecpy);
+				   ssize_t pagecpy)
+	__attribute__((visibility("hidden")));
 
 /*
  * Subbuffer ID bits for overwrite mode. Need to fit within a single word to be
@@ -207,11 +207,12 @@ int lib_ring_buffer_backend_get_pages(const struct lttng_ust_lib_ring_buffer_con
 			struct lttng_ust_lib_ring_buffer_ctx *ctx,
 			struct lttng_ust_lib_ring_buffer_backend_pages **backend_pages)
 {
-	struct lttng_ust_lib_ring_buffer_backend *bufb = &ctx->buf->backend;
-	struct channel_backend *chanb = &ctx->chan->backend;
-	struct lttng_ust_shm_handle *handle = ctx->handle;
+	struct lttng_ust_lib_ring_buffer_ctx_private *ctx_private = ctx->priv;
+	struct lttng_ust_lib_ring_buffer_backend *bufb = &ctx_private->buf->backend;
+	struct channel_backend *chanb = &ctx_private->chan->backend;
+	struct lttng_ust_shm_handle *handle = ctx_private->chan->handle;
 	size_t sbidx;
-	size_t offset = ctx->buf_offset;
+	size_t offset = ctx_private->buf_offset;
 	struct lttng_ust_lib_ring_buffer_backend_subbuffer *wsb;
 	struct lttng_ust_lib_ring_buffer_backend_pages_shmp *rpages;
 	unsigned long sb_bindex, id;
@@ -227,7 +228,7 @@ int lib_ring_buffer_backend_get_pages(const struct lttng_ust_lib_ring_buffer_con
 	rpages = shmp_index(handle, bufb->array, sb_bindex);
 	if (caa_unlikely(!rpages))
 		return -1;
-	CHAN_WARN_ON(ctx->chan,
+	CHAN_WARN_ON(ctx_private->chan,
 		     config->mode == RING_BUFFER_OVERWRITE
 		     && subbuffer_id_is_noref(config, id));
 	_backend_pages = shmp(handle, rpages->shmp);
@@ -243,7 +244,7 @@ struct lttng_ust_lib_ring_buffer_backend_pages *
 	lib_ring_buffer_get_backend_pages_from_ctx(const struct lttng_ust_lib_ring_buffer_config *config,
 		struct lttng_ust_lib_ring_buffer_ctx *ctx)
 {
-	return ctx->backend_pages;
+	return ctx->priv->backend_pages;
 }
 
 /*