X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=e7d51078e64b9b5209d4e8208a61a25d9e0bef38;hp=026d9f0f83b56731b9bd04303b9af69720aee1df;hb=e71aad1fa4b06a5f91ddceace42366f3d79bd77e;hpb=f5204c9440be52e1b17bbb2c82450277ec02a583

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 026d9f0f8..e7d51078e 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -19,7 +19,6 @@
 
 #define _GNU_SOURCE
 #include <assert.h>
-#include <fcntl.h>
 #include <poll.h>
 #include <pthread.h>
 #include <stdlib.h>
@@ -174,13 +173,22 @@ void consumer_del_stream(struct lttng_consumer_stream *stream)
 		goto end;
 	}
 	if (stream->out_fd >= 0) {
-		close(stream->out_fd);
+		ret = close(stream->out_fd);
+		if (ret) {
+			PERROR("close");
+		}
 	}
 	if (stream->wait_fd >= 0 && !stream->wait_fd_is_copy) {
-		close(stream->wait_fd);
+		ret = close(stream->wait_fd);
+		if (ret) {
+			PERROR("close");
+		}
 	}
 	if (stream->shm_fd >= 0 && stream->wait_fd != stream->shm_fd) {
-		close(stream->shm_fd);
+		ret = close(stream->shm_fd);
+		if (ret) {
+			PERROR("close");
+		}
 	}
 	if (!--stream->chan->refcount)
 		free_chan = stream->chan;
@@ -361,10 +369,16 @@ void consumer_del_channel(struct lttng_consumer_channel *channel)
 		}
 	}
 	if (channel->wait_fd >= 0 && !channel->wait_fd_is_copy) {
-		close(channel->wait_fd);
+		ret = close(channel->wait_fd);
+		if (ret) {
+			PERROR("close");
+		}
 	}
 	if (channel->shm_fd >= 0 && channel->wait_fd != channel->shm_fd) {
-		close(channel->shm_fd);
+		ret = close(channel->shm_fd);
+		if (ret) {
+			PERROR("close");
+		}
 	}
 	free(channel);
 end:
@@ -608,7 +622,7 @@ void lttng_consumer_sync_trace_file(
 	if (orig_offset < stream->chan->max_sb_size) {
 		return;
 	}
-	sync_file_range(outfd, orig_offset - stream->chan->max_sb_size,
+	lttng_sync_file_range(outfd, orig_offset - stream->chan->max_sb_size,
 			stream->chan->max_sb_size,
 			SYNC_FILE_RANGE_WAIT_BEFORE
 			| SYNC_FILE_RANGE_WRITE
@@ -699,14 +713,18 @@ error_thread_pipe:
 		int err;
 
 		err = close(ctx->consumer_should_quit[i]);
-		assert(!err);
+		if (err) {
+			PERROR("close");
+		}
 	}
 error_quit_pipe:
 	for (i = 0; i < 2; i++) {
 		int err;
 
 		err = close(ctx->consumer_poll_pipe[i]);
-		assert(!err);
+		if (err) {
+			PERROR("close");
+		}
 	}
 error_poll_pipe:
 	free(ctx);
@@ -719,13 +737,36 @@ error:
  */
 void lttng_consumer_destroy(struct lttng_consumer_local_data *ctx)
 {
-	close(ctx->consumer_error_socket);
-	close(ctx->consumer_thread_pipe[0]);
-	close(ctx->consumer_thread_pipe[1]);
-	close(ctx->consumer_poll_pipe[0]);
-	close(ctx->consumer_poll_pipe[1]);
-	close(ctx->consumer_should_quit[0]);
-	close(ctx->consumer_should_quit[1]);
+	int ret;
+
+	ret = close(ctx->consumer_error_socket);
+	if (ret) {
+		PERROR("close");
+	}
+	ret = close(ctx->consumer_thread_pipe[0]);
+	if (ret) {
+		PERROR("close");
+	}
+	ret = close(ctx->consumer_thread_pipe[1]);
+	if (ret) {
+		PERROR("close");
+	}
+	ret = close(ctx->consumer_poll_pipe[0]);
+	if (ret) {
+		PERROR("close");
+	}
+	ret = close(ctx->consumer_poll_pipe[1]);
+	if (ret) {
+		PERROR("close");
+	}
+	ret = close(ctx->consumer_should_quit[0]);
+	if (ret) {
+		PERROR("close");
+	}
+	ret = close(ctx->consumer_should_quit[1]);
+	if (ret) {
+		PERROR("close");
+	}
 	unlink(ctx->consumer_command_sock_path);
 	free(ctx);
 }
@@ -749,6 +790,8 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 		ERR("Unknown consumer_data type");
 		assert(0);
 	}
+
+	return 0;
 }
 
 /*