X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=e182c991f147baf89bcb482da2ff9b4936d775b6;hb=f5dbe415fb8c3efcdcd68968b8cc8f40369b9cd9;hp=321703a5157305104f855a3834a55ddf81434bc5;hpb=c7a78aabfa0491974d4ffc188d72eb1e67c7344e;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 321703a51..e182c991f 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -1021,7 +1021,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;
@@ -1229,6 +1229,11 @@ void lttng_consumer_should_exit(struct lttng_consumer_local_data *ctx)
 	DBG("Consumer flag that it should quit");
 }
 
+
+/*
+ * Flush pending writes to trace output disk file.
+ */
+static
 void lttng_consumer_sync_trace_file(struct lttng_consumer_stream *stream,
 		off_t orig_offset)
 {
@@ -1265,8 +1270,9 @@ void lttng_consumer_sync_trace_file(struct lttng_consumer_stream *stream,
 	 */
 	ret = posix_fadvise(outfd, orig_offset - stream->max_sb_size,
 			stream->max_sb_size, POSIX_FADV_DONTNEED);
-	if (ret) {
-		WARN("posix_fadvise() error (%i)", ret);
+	if (ret && ret != -ENOSYS) {
+		errno = ret;
+		PERROR("posix_fadvise on fd %i", outfd);
 	}
 }
 
@@ -1686,8 +1692,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:
 	/*
@@ -1916,7 +1922,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: