X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=libust%2Fltt-ring-buffer-client.h;h=6392739b50160aa4ff76efd9c70fa4a00f8666a7;hb=43d330a4708732a69334f8e1439f1d0c64770a50;hp=605a28284e7e32c74664ff25190db46b7c7ddad5;hpb=381c0f1ef474e0ae8a96b3753470ca4bda45c764;p=lttng-ust.git

diff --git a/libust/ltt-ring-buffer-client.h b/libust/ltt-ring-buffer-client.h
index 605a2828..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;
@@ -380,11 +382,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);
@@ -394,7 +399,7 @@ 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
@@ -410,7 +415,7 @@ struct lib_ring_buffer *ltt_buffer_read_open(struct channel *chan,
 		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))
+		if (!lib_ring_buffer_open_read(buf, handle, 0))
 			return buf;
 	}
 	return NULL;
@@ -420,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
@@ -498,6 +503,25 @@ 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 "-mmap",
 	.ops = {
@@ -513,6 +537,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,
 	},
 };