X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libust%2Fltt-ring-buffer-metadata-client.h;h=0102860ed64b8d6af3a1b49f6251b2c21e353839;hb=824f40b81426c6ac82685251018dae00947786a9;hp=00c07fc57e80e47f6dda25be958a911bf4eca08d;hpb=1b2c2540d02d98833e3243284e0833fd3799a5a7;p=lttng-ust.git

diff --git a/libust/ltt-ring-buffer-metadata-client.h b/libust/ltt-ring-buffer-metadata-client.h
index 00c07fc5..0102860e 100644
--- a/libust/ltt-ring-buffer-metadata-client.h
+++ b/libust/ltt-ring-buffer-metadata-client.h
@@ -160,11 +160,14 @@ struct ltt_channel *_channel_create(const char *name,
 				struct ltt_channel *ltt_chan, void *buf_addr,
 				size_t subbuf_size, size_t num_subbuf,
 				unsigned int switch_timer_interval,
-				unsigned int read_timer_interval)
+				unsigned int read_timer_interval,
+				int *shm_fd, int *wait_fd,
+				uint64_t *memory_map_size)
 {
 	ltt_chan->handle = channel_create(&client_config, name, ltt_chan, buf_addr,
 			      subbuf_size, num_subbuf, switch_timer_interval,
-			      read_timer_interval);
+			      read_timer_interval, shm_fd, wait_fd,
+			      memory_map_size);
 	if (!ltt_chan->handle)
 		return NULL;
 	ltt_chan->chan = shmp(ltt_chan->handle, ltt_chan->handle->chan);
@@ -174,17 +177,20 @@ struct ltt_channel *_channel_create(const char *name,
 static
 void ltt_channel_destroy(struct ltt_channel *ltt_chan)
 {
-	channel_destroy(ltt_chan->chan, ltt_chan->handle);
+	channel_destroy(ltt_chan->chan, ltt_chan->handle, 0);
 }
 
 static
 struct lib_ring_buffer *ltt_buffer_read_open(struct channel *chan,
-					     struct shm_handle *handle)
+					     struct shm_handle *handle,
+					     int *shm_fd, int *wait_fd,
+					     uint64_t *memory_map_size)
 {
 	struct lib_ring_buffer *buf;
 
-	buf = channel_get_ring_buffer(&client_config, chan, 0, handle);
-	if (!lib_ring_buffer_open_read(buf, handle))
+	buf = channel_get_ring_buffer(&client_config, chan,
+			0, handle, shm_fd, wait_fd, memory_map_size);
+	if (!lib_ring_buffer_open_read(buf, handle, 0))
 		return buf;
 	return NULL;
 }
@@ -193,7 +199,7 @@ static
 void ltt_buffer_read_close(struct lib_ring_buffer *buf,
 			   struct shm_handle *handle)
 {
-	lib_ring_buffer_release_read(buf, handle);
+	lib_ring_buffer_release_read(buf, handle, 0);
 }
 
 static
@@ -276,15 +282,13 @@ static struct ltt_transport ltt_relay_transport = {
 	},
 };
 
-static
-void __attribute__((constructor)) ltt_ring_buffer_client_init(void)
+void RING_BUFFER_MODE_TEMPLATE_INIT(void)
 {
 	DBG("LTT : ltt ring buffer client init\n");
 	ltt_transport_register(&ltt_relay_transport);
 }
 
-static
-void __attribute__((destructor)) ltt_ring_buffer_client_exit(void)
+void RING_BUFFER_MODE_TEMPLATE_EXIT(void)
 {
 	DBG("LTT : ltt ring buffer client exit\n");
 	ltt_transport_unregister(&ltt_relay_transport);