X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Fltt-ring-buffer-client.h;h=270cb1e9f1a77c2f4073e728225ffc35aa5ed696;hb=a51070bbd35a914f8bf83d774ea92c23e3e059b4;hp=2fe854a383d8821df6e2f1855df13c40b26e6c9a;hpb=9dcb02efd18948134deb8469a39478f250033269;p=lttng-ust.git

diff --git a/libust/ltt-ring-buffer-client.h b/libust/ltt-ring-buffer-client.h
index 2fe854a3..270cb1e9 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,19 +399,23 @@ 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;
 	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;
@@ -416,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