X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=4bc2d2e9f1da9ceaa6e482791ece71e9ec629e5c;hb=b467859aba9a4835b1700c73c51c3528d7686c5b;hp=628d06c4a8eff03d69b37e29b7a4c9ef7db95737;hpb=ad77215839fa5fd769217a0a74d3134ed85158e0;p=lttng-tools.git

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 628d06c4a..4bc2d2e9f 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -1022,7 +1022,7 @@ struct lttng_consumer_channel *consumer_allocate_channel(uint64_t key,
 
 	CDS_INIT_LIST_HEAD(&channel->streams.head);
 
-	DBG("Allocated channel (key %" PRIu64 ")", channel->key)
+	DBG("Allocated channel (key %" PRIu64 ")", channel->key);
 
 end:
 	return channel;
@@ -1233,6 +1233,7 @@ void lttng_consumer_should_exit(struct lttng_consumer_local_data *ctx)
 void lttng_consumer_sync_trace_file(struct lttng_consumer_stream *stream,
 		off_t orig_offset)
 {
+	int ret;
 	int outfd = stream->out_fd;
 
 	/*
@@ -1263,8 +1264,12 @@ void lttng_consumer_sync_trace_file(struct lttng_consumer_stream *stream,
 	 * defined. So it can be expected to lead to lower throughput in
 	 * streaming.
 	 */
-	posix_fadvise(outfd, orig_offset - stream->max_sb_size,
+	ret = posix_fadvise(outfd, orig_offset - stream->max_sb_size,
 			stream->max_sb_size, POSIX_FADV_DONTNEED);
+	if (ret && ret != -ENOSYS) {
+		errno = ret;
+		PERROR("posix_fadvise on fd %i", outfd);
+	}
 }
 
 /*
@@ -1598,6 +1603,12 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 			outfd = stream->out_fd;
 
 			if (stream->index_fd >= 0) {
+				ret = close(stream->index_fd);
+				if (ret < 0) {
+					PERROR("Closing index");
+					goto end;
+				}
+				stream->index_fd = -1;
 				ret = index_create_file(stream->chan->pathname,
 						stream->name, stream->uid, stream->gid,
 						stream->chan->tracefile_size,
@@ -1658,8 +1669,8 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 		lttng_sync_file_range(outfd, stream->out_fd_offset, len,
 				SYNC_FILE_RANGE_WRITE);
 		stream->out_fd_offset += len;
+		lttng_consumer_sync_trace_file(stream, orig_offset);
 	}
-	lttng_consumer_sync_trace_file(stream, orig_offset);
 
 write_error:
 	/*
@@ -1870,7 +1881,9 @@ ssize_t lttng_consumer_on_read_subbuffer_splice(
 		stream->output_written += ret_splice;
 		written += ret_splice;
 	}
-	lttng_consumer_sync_trace_file(stream, orig_offset);
+	if (!relayd) {
+		lttng_consumer_sync_trace_file(stream, orig_offset);
+	}
 	goto end;
 
 write_error:
@@ -2219,10 +2232,10 @@ restart:
 		DBG("Metadata poll return from wait with %d fd(s)",
 				LTTNG_POLL_GETNB(&events));
 		health_poll_exit();
-		DBG("Metadata event catched in thread");
+		DBG("Metadata event caught in thread");
 		if (ret < 0) {
 			if (errno == EINTR) {
-				ERR("Poll EINTR catched");
+				ERR("Poll EINTR caught");
 				goto restart;
 			}
 			if (LTTNG_POLL_GETNB(&events) == 0) {
@@ -2802,10 +2815,10 @@ restart:
 		DBG("Channel poll return from wait with %d fd(s)",
 				LTTNG_POLL_GETNB(&events));
 		health_poll_exit();
-		DBG("Channel event catched in thread");
+		DBG("Channel event caught in thread");
 		if (ret < 0) {
 			if (errno == EINTR) {
-				ERR("Poll EINTR catched");
+				ERR("Poll EINTR caught");
 				goto restart;
 			}
 			if (LTTNG_POLL_GETNB(&events) == 0) {