X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=7032a7f7ffcc9bea224db0c6059f1928de72aa47;hp=275c963df2305dee886327378f0a6a78e977e8db;hb=a2814ea7573bf5edd5323d6f89c48ff14105db69;hpb=128708c34ee7d054755d110df12940155c2dd781

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 275c963df..7032a7f7f 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -7,6 +7,7 @@
  *
  */
 
+#include "common/buffer-view.h"
 #include <stdint.h>
 #define _LGPL_SOURCE
 #include <assert.h>
@@ -249,9 +250,9 @@ static int lttng_kconsumer_snapshot_channel(
 			ssize_t read_len;
 			unsigned long len, padded_len;
 			const char *subbuf_addr;
+			struct lttng_buffer_view subbuf_view;
 
 			health_code_update();
-
 			DBG("Kernel consumer taking snapshot at pos %lu", consumed_pos);
 
 			ret = kernctl_get_subbuf(stream->wait_fd, &consumed_pos);
@@ -283,8 +284,10 @@ static int lttng_kconsumer_snapshot_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,
+					stream, &subbuf_view,
 					padded_len - len, NULL);
 			/*
 			 * We write the padded len in local tracefiles but the data len
@@ -510,6 +513,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				msg.u.channel.tracefile_count, 0,
 				msg.u.channel.monitor,
 				msg.u.channel.live_timer_interval,
+				msg.u.channel.is_live,
 				NULL, NULL);
 		if (new_channel == NULL) {
 			lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_OUTFD_ERROR);
@@ -651,7 +655,9 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		health_code_update();
 
 		pthread_mutex_lock(&channel->lock);
-		new_stream = consumer_allocate_stream(channel->key,
+		new_stream = consumer_allocate_stream(
+				channel,
+				channel->key,
 				fd,
 				channel->name,
 				channel->relayd_id,
@@ -673,7 +679,6 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			goto error_add_stream_nosignal;
 		}
 
-		new_stream->chan = channel;
 		new_stream->wait_fd = fd;
 		ret = kernctl_get_max_subbuf_size(new_stream->wait_fd,
 				&new_stream->max_sb_size);
@@ -1720,6 +1725,7 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 	case CONSUMER_CHANNEL_MMAP:
 	{
 		const char *subbuf_addr;
+		struct lttng_buffer_view subbuf_view;
 
 		/* Get subbuffer size without padding */
 		err = kernctl_get_subbuf_size(infd, &subbuf_size);
@@ -1750,15 +1756,15 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 
 		padding = len - subbuf_size;
 
+		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);
+		ret = lttng_consumer_on_read_subbuffer_mmap(
+				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_
-		 * streaming.
+		 * The mmap operation should write subbuf_size amount of data
+		 * when network streaming or the full padding (len) size when we
+		 * are _not_ streaming.
 		 */
 		if ((ret != subbuf_size && stream->net_seq_idx != (uint64_t) -1ULL) ||
 				(ret != len && stream->net_seq_idx == (uint64_t) -1ULL)) {