X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=a6d8463a8ce2f6709da1de394e4b7729632af574;hp=9055d0cf8baa82ef9a88257a3b002aa5823c1e5d;hb=fd424d99bfddf3581bc55fdf14799a50661beddd;hpb=128708c34ee7d054755d110df12940155c2dd781;ds=sidebyside

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 9055d0cf8..a6d8463a8 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -1211,6 +1211,7 @@ static int snapshot_channel(struct lttng_consumer_channel *channel,
 			ssize_t read_len;
 			unsigned long len, padded_len;
 			const char *subbuf_addr;
+			struct lttng_buffer_view subbuf_view;
 
 			health_code_update();
 
@@ -1245,9 +1246,11 @@ static int snapshot_channel(struct lttng_consumer_channel *channel,
 				goto error_put_subbuf;
 			}
 
+			subbuf_view = lttng_buffer_view_init(
+					subbuf_addr, 0, padded_len);
 			read_len = lttng_consumer_on_read_subbuffer_mmap(ctx,
-					stream, subbuf_addr, len,
-					padded_len - len, NULL);
+					stream, &subbuf_view, padded_len - len,
+					NULL);
 			if (use_relayd) {
 				if (read_len != len) {
 					ret = -EPERM;
@@ -2808,6 +2811,7 @@ int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 	struct ustctl_consumer_stream *ustream;
 	struct ctf_packet_index index;
 	const char *subbuf_addr;
+	struct lttng_buffer_view subbuf_view;
 
 	assert(stream);
 	assert(stream->ustream);
@@ -2923,9 +2927,11 @@ retry:
 		goto error_put_subbuf;
 	}
 
+	subbuf_view = lttng_buffer_view_init(subbuf_addr, 0, len);
+
 	/* write the subbuffer to the tracefile */
 	ret = lttng_consumer_on_read_subbuffer_mmap(
-			ctx, stream, subbuf_addr, subbuf_size, padding, &index);
+			ctx, stream, &subbuf_view, padding, &index);
 	/*
 	 * The mmap operation should write subbuf_size amount of data when
 	 * network streaming or the full padding (len) size when we are _not_