X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fltt-ring-buffer-client.h;h=6392739b50160aa4ff76efd9c70fa4a00f8666a7;hb=43d330a4708732a69334f8e1439f1d0c64770a50;hp=f15711c1320e00d7c7b3dc9f88100dd195f15510;hpb=18c1cd87c54290691f0e6913f84c16fa5267b86d;p=lttng-ust.git

diff --git a/libust/ltt-ring-buffer-client.h b/libust/ltt-ring-buffer-client.h
index f15711c1..6392739b 100644
--- a/libust/ltt-ring-buffer-client.h
+++ b/libust/ltt-ring-buffer-client.h
@@ -198,6 +198,7 @@ void ltt_write_event_header(const struct lib_ring_buffer_config *config,
 
 	ctx_record(ctx, ltt_chan, ltt_chan->ctx);
 	ctx_record(ctx, ltt_chan, event->ctx);
+	lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
 
 	return;
 
@@ -261,6 +262,7 @@ void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config,
 	}
 	ctx_record(ctx, ltt_chan, ltt_chan->ctx);
 	ctx_record(ctx, ltt_chan, event->ctx);
+	lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
 }
 
 static const struct lib_ring_buffer_config client_config;
@@ -335,7 +337,11 @@ static void client_buffer_end(struct lib_ring_buffer *buf, u64 tsc,
 	header->ctx.timestamp_end = tsc;
 	header->ctx.content_size = data_size * CHAR_BIT; 	/* in bits */
 	header->ctx.packet_size = PAGE_ALIGN(data_size) * CHAR_BIT; /* in bits */
-	records_lost += lib_ring_buffer_get_records_lost_full(&client_config, buf);
+	/*
+	 * We do not care about the records lost count, because the metadata
+	 * channel waits and retry.
+	 */
+	(void) lib_ring_buffer_get_records_lost_full(&client_config, buf);
 	records_lost += lib_ring_buffer_get_records_lost_wrap(&client_config, buf);
 	records_lost += lib_ring_buffer_get_records_lost_big(&client_config, buf);
 	header->ctx.events_discarded = records_lost;
@@ -376,31 +382,40 @@ 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;
 	int cpu;
 
 	for_each_channel_cpu(cpu, chan) {
-		buf = channel_get_ring_buffer(&client_config, chan, cpu, handle);
-		if (!lib_ring_buffer_open_read(buf, handle))
+		buf = channel_get_ring_buffer(&client_config, chan,
+				cpu, handle, shm_fd, wait_fd,
+				memory_map_size);
+		if (!lib_ring_buffer_open_read(buf, handle, 0))
 			return buf;
 	}
 	return NULL;
@@ -410,7 +425,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
@@ -488,8 +503,27 @@ 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 cpu;
+
+	for_each_channel_cpu(cpu, chan) {
+		int shm_fd, wait_fd;
+		uint64_t memory_map_size;
+
+		buf = channel_get_ring_buffer(&client_config, chan,
+				cpu, 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,
@@ -503,18 +537,17 @@ 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)
 {
 	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);