X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fltt-ring-buffer-metadata-client.h;h=477d6b955b9b8de731d1628b0d2f49c3b823068b;hb=43d330a4708732a69334f8e1439f1d0c64770a50;hp=88716a26f6b7d36548a50d96fafcb4790be2376a;hpb=1d4981969313da002983ca979bd85c95493f7316;p=lttng-ust.git

diff --git a/libust/ltt-ring-buffer-metadata-client.h b/libust/ltt-ring-buffer-metadata-client.h
index 88716a26..477d6b95 100644
--- a/libust/ltt-ring-buffer-metadata-client.h
+++ b/libust/ltt-ring-buffer-metadata-client.h
@@ -23,6 +23,8 @@ struct metadata_packet_header {
 	uint8_t  compression_scheme;	/* 0 if unused */
 	uint8_t  encryption_scheme;	/* 0 if unused */
 	uint8_t  checksum_scheme;	/* 0 if unused */
+	uint8_t  major;			/* CTF spec major version number */
+	uint8_t  minor;			/* CTF spec minor version number */
 	uint8_t  header_end[0];
 };
 
@@ -96,6 +98,9 @@ static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc,
 	header->compression_scheme = 0;	/* 0 if unused */
 	header->encryption_scheme = 0;	/* 0 if unused */
 	header->checksum_scheme = 0;	/* 0 if unused */
+	header->major = CTF_SPEC_MAJOR;
+	header->minor = CTF_SPEC_MINOR;
+
 }
 
 /*
@@ -149,10 +154,10 @@ static const struct lib_ring_buffer_config client_config = {
 	.sync = RING_BUFFER_SYNC_GLOBAL,
 	.mode = RING_BUFFER_MODE_TEMPLATE,
 	.backend = RING_BUFFER_PAGE,
-	.output = RING_BUFFER_SPLICE,
+	.output = RING_BUFFER_MMAP,
 	.oops = RING_BUFFER_OOPS_CONSISTENCY,
-	.ipi = RING_BUFFER_IPI_BARRIER,
-	.wakeup = RING_BUFFER_WAKEUP_BY_TIMER,
+	.ipi = RING_BUFFER_NO_IPI_BARRIER,
+	.wakeup = RING_BUFFER_WAKEUP_BY_WRITER,
 };
 
 static
@@ -160,29 +165,37 @@ 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);
-	ltt_chan->chan = shmp(handle, handle->chan);
+			      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);
 	return ltt_chan;
 }
 
 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;
 }
@@ -191,7 +204,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
@@ -256,8 +269,23 @@ int ltt_is_disabled(struct channel *chan)
 	return lib_ring_buffer_channel_is_disabled(chan);
 }
 
+static
+int ltt_flush_buffer(struct channel *chan, struct shm_handle *handle)
+{
+	struct lib_ring_buffer *buf;
+	int shm_fd, wait_fd;
+	uint64_t memory_map_size;
+
+	buf = channel_get_ring_buffer(&client_config, chan,
+			0, handle, &shm_fd, &wait_fd,
+			&memory_map_size);
+	lib_ring_buffer_switch(&client_config, buf,
+			SWITCH_ACTIVE, handle);
+	return 0;
+}
+
 static struct ltt_transport ltt_relay_transport = {
-	.name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING,
+	.name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING "-mmap",
 	.ops = {
 		.channel_create = _channel_create,
 		.channel_destroy = ltt_channel_destroy,
@@ -271,19 +299,18 @@ static struct ltt_transport ltt_relay_transport = {
 		//.get_hp_wait_queue = ltt_get_hp_wait_queue,
 		.is_finalized = ltt_is_finalized,
 		.is_disabled = ltt_is_disabled,
+		.flush_buffer = ltt_flush_buffer,
 	},
 };
 
-static
-void __attribute__((constructor)) ltt_ring_buffer_client_init(void)
+void RING_BUFFER_MODE_TEMPLATE_INIT(void)
 {
-	printf("LTT : ltt ring buffer client init\n");
+	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)
 {
-	printf("LTT : ltt ring buffer client exit\n");
+	DBG("LTT : ltt ring buffer client exit\n");
 	ltt_transport_unregister(&ltt_relay_transport);
 }