X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=20d0405a3b40e8d828c883dd3b57606583e2d770;hb=4c462e790c62ed5f6c5d61b3a182762fe02f7e9a;hp=9a5775b8ed3bff1bf996dc244516b1dce2685257;hpb=826a02a292d2bd409be87ea96ba2fccbccee76b1;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 9a5775b8e..20d0405a3 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -26,14 +26,12 @@
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/socket.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <lttng/ust-ctl.h>
 
 #include <common/common.h>
 #include <common/sessiond-comm/sessiond-comm.h>
-#include <common/compat/fcntl.h>
 
 #include "ust-consumer.h"
 
@@ -44,9 +42,9 @@ extern volatile int consumer_quit;
 /*
  * Mmap the ring buffer, read it and write the data to the tracefile.
  *
- * Returns the number of bytes written
+ * Returns the number of bytes written, else negative value on error.
  */
-int lttng_ustconsumer_on_read_subbuffer_mmap(
+ssize_t lttng_ustconsumer_on_read_subbuffer_mmap(
 		struct lttng_consumer_local_data *ctx,
 		struct lttng_consumer_stream *stream, unsigned long len)
 {
@@ -59,8 +57,8 @@ int lttng_ustconsumer_on_read_subbuffer_mmap(
 	ret = ustctl_get_mmap_read_offset(stream->chan->handle,
 		stream->buf, &mmap_offset);
 	if (ret != 0) {
-		ret = -errno;
-		perror("ustctl_get_mmap_read_offset");
+		errno = -ret;
+		PERROR("ustctl_get_mmap_read_offset");
 		goto end;
 	}
 	while (len > 0) {
@@ -68,12 +66,12 @@ int lttng_ustconsumer_on_read_subbuffer_mmap(
 		if (ret >= len) {
 			len = 0;
 		} else if (ret < 0) {
-			ret = -errno;
-			perror("Error in file write");
+			errno = -ret;
+			PERROR("Error in file write");
 			goto end;
 		}
 		/* This won't block, but will start writeout asynchronously */
-		lttng_sync_file_range(outfd, stream->out_fd_offset, ret,
+		sync_file_range(outfd, stream->out_fd_offset, ret,
 				SYNC_FILE_RANGE_WRITE);
 		stream->out_fd_offset += ret;
 	}
@@ -91,7 +89,7 @@ end:
  *
  * Returns the number of bytes spliced.
  */
-int lttng_ustconsumer_on_read_subbuffer_splice(
+ssize_t lttng_ustconsumer_on_read_subbuffer_splice(
 		struct lttng_consumer_local_data *ctx,
 		struct lttng_consumer_stream *stream, unsigned long len)
 {
@@ -110,8 +108,8 @@ int lttng_ustconsumer_take_snapshot(struct lttng_consumer_local_data *ctx,
 
 	ret = ustctl_snapshot(stream->chan->handle, stream->buf);
 	if (ret != 0) {
-		ret = errno;
-		perror("Getting sub-buffer snapshot.");
+		errno = -ret;
+		PERROR("Getting sub-buffer snapshot.");
 	}
 
 	return ret;
@@ -132,8 +130,8 @@ int lttng_ustconsumer_get_produced_snapshot(
 	ret = ustctl_snapshot_get_produced(stream->chan->handle,
 			stream->buf, pos);
 	if (ret != 0) {
-		ret = errno;
-		perror("kernctl_snapshot_get_produced");
+		errno = -ret;
+		PERROR("kernctl_snapshot_get_produced");
 	}
 
 	return ret;
@@ -262,7 +260,7 @@ end:
 	/* signal the poll thread */
 	ret = write(ctx->consumer_poll_pipe[1], "4", 1);
 	if (ret < 0) {
-		perror("write consumer poll");
+		PERROR("write consumer poll");
 	}
 end_nosignal:
 	return 0;
@@ -348,7 +346,7 @@ int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 	if (!stream->hangup_flush_done) {
 		do {
 			readlen = read(stream->wait_fd, &dummy, 1);
-		} while (readlen == -1 && errno == -EINTR);
+		} while (readlen == -1 && errno == EINTR);
 		if (readlen == -1) {
 			ret = readlen;
 			goto end;
@@ -402,7 +400,7 @@ int lttng_ustconsumer_on_recv_stream(struct lttng_consumer_stream *stream)
 				stream->uid, stream->gid);
 		if (ret < 0) {
 			ERR("Opening %s", stream->path_name);
-			perror("open");
+			PERROR("open");
 			goto error;
 		}
 		stream->out_fd = ret;