X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=d70a5d1d406b758e1b02cc61f22b440ee006a7b1;hp=64057c785f9512d734ccbd78649214125fad824d;hb=fd424d99bfddf3581bc55fdf14799a50661beddd;hpb=128708c34ee7d054755d110df12940155c2dd781

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 64057c785..d70a5d1d4 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -1671,8 +1671,7 @@ end:
 ssize_t lttng_consumer_on_read_subbuffer_mmap(
 		struct lttng_consumer_local_data *ctx,
 		struct lttng_consumer_stream *stream,
-		const char *buffer,
-		unsigned long len,
+		const struct lttng_buffer_view *buffer,
 		unsigned long padding,
 		struct ctf_packet_index *index)
 {
@@ -1682,6 +1681,8 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 	int outfd = stream->out_fd;
 	struct consumer_relayd_sock_pair *relayd = NULL;
 	unsigned int relayd_hang_up = 0;
+	const size_t subbuf_content_size = buffer->size - padding;
+	size_t write_len;
 
 	/* RCU lock for the relayd pointer */
 	rcu_read_lock();
@@ -1699,7 +1700,7 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 
 	/* Handle stream on the relayd if the output is on the network */
 	if (relayd) {
-		unsigned long netlen = len;
+		unsigned long netlen = subbuf_content_size;
 
 		/*
 		 * Lock the control socket for the complete duration of the function
@@ -1737,10 +1738,10 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 				goto write_error;
 			}
 		}
-	} else {
-		/* No streaming, we have to set the len with the full padding */
-		len += padding;
 
+		write_len = subbuf_content_size;
+	} else {
+		/* No streaming; we have to write the full padding. */
 		if (stream->metadata_flag && stream->reset_metadata_flag) {
 			ret = utils_truncate_stream_file(stream->out_fd, 0);
 			if (ret < 0) {
@@ -1754,7 +1755,7 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 		 * Check if we need to change the tracefile before writing the packet.
 		 */
 		if (stream->chan->tracefile_size > 0 &&
-				(stream->tracefile_size_current + len) >
+				(stream->tracefile_size_current + buffer->size) >
 				stream->chan->tracefile_size) {
 			ret = consumer_stream_rotate_output_files(stream);
 			if (ret) {
@@ -1763,19 +1764,21 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 			outfd = stream->out_fd;
 			orig_offset = 0;
 		}
-		stream->tracefile_size_current += len;
+		stream->tracefile_size_current += buffer->size;
 		if (index) {
 			index->offset = htobe64(stream->out_fd_offset);
 		}
+
+		write_len = buffer->size;
 	}
 
 	/*
 	 * This call guarantee that len or less is returned. It's impossible to
 	 * receive a ret value that is bigger than len.
 	 */
-	ret = lttng_write(outfd, buffer, len);
-	DBG("Consumer mmap write() ret %zd (len %lu)", ret, len);
-	if (ret < 0 || ((size_t) ret != len)) {
+	ret = lttng_write(outfd, buffer->data, write_len);
+	DBG("Consumer mmap write() ret %zd (len %lu)", ret, write_len);
+	if (ret < 0 || ((size_t) ret != write_len)) {
 		/*
 		 * Report error to caller if nothing was written else at least send the
 		 * amount written.
@@ -1796,7 +1799,8 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 			DBG("Consumer mmap write detected relayd hang up");
 		} else {
 			/* Unhandled error, print it and stop function right now. */
-			PERROR("Error in write mmap (ret %zd != len %lu)", ret, len);
+			PERROR("Error in write mmap (ret %zd != write_len %zu)", ret,
+					write_len);
 		}
 		goto write_error;
 	}
@@ -1805,9 +1809,9 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 	/* This call is useless on a socket so better save a syscall. */
 	if (!relayd) {
 		/* This won't block, but will start writeout asynchronously */
-		lttng_sync_file_range(outfd, stream->out_fd_offset, len,
+		lttng_sync_file_range(outfd, stream->out_fd_offset, write_len,
 				SYNC_FILE_RANGE_WRITE);
-		stream->out_fd_offset += len;
+		stream->out_fd_offset += write_len;
 		lttng_consumer_sync_trace_file(stream, orig_offset);
 	}