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

diff --git a/libust/ltt-ring-buffer-metadata-client.h b/libust/ltt-ring-buffer-metadata-client.h
index 3e16890e..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;
+
 }
 
 /*
@@ -160,11 +165,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 +182,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 +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
@@ -258,6 +269,21 @@ 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 "-mmap",
 	.ops = {
@@ -273,6 +299,7 @@ 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,
 	},
 };