X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=64057c785f9512d734ccbd78649214125fad824d;hp=b649d198aaad9c49ed139eb7d2520ce1c28f5373;hb=128708c34ee7d054755d110df12940155c2dd781;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index b649d198a..64057c785 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -1670,12 +1670,12 @@ end:
  */
 ssize_t lttng_consumer_on_read_subbuffer_mmap(
 		struct lttng_consumer_local_data *ctx,
-		struct lttng_consumer_stream *stream, unsigned long len,
+		struct lttng_consumer_stream *stream,
+		const char *buffer,
+		unsigned long len,
 		unsigned long padding,
 		struct ctf_packet_index *index)
 {
-	unsigned long mmap_offset;
-	void *mmap_base;
 	ssize_t ret = 0;
 	off_t orig_offset = stream->out_fd_offset;
 	/* Default is on the disk */
@@ -1697,36 +1697,6 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 		}
 	}
 
-	/* get the offset inside the fd to mmap */
-	switch (consumer_data.type) {
-	case LTTNG_CONSUMER_KERNEL:
-		mmap_base = stream->mmap_base;
-		ret = kernctl_get_mmap_read_offset(stream->wait_fd, &mmap_offset);
-		if (ret < 0) {
-			PERROR("tracer ctl get_mmap_read_offset");
-			goto end;
-		}
-		break;
-	case LTTNG_CONSUMER32_UST:
-	case LTTNG_CONSUMER64_UST:
-		mmap_base = lttng_ustctl_get_mmap_base(stream);
-		if (!mmap_base) {
-			ERR("read mmap get mmap base for stream %s", stream->name);
-			ret = -EPERM;
-			goto end;
-		}
-		ret = lttng_ustctl_get_mmap_read_offset(stream, &mmap_offset);
-		if (ret != 0) {
-			PERROR("tracer ctl get_mmap_read_offset");
-			ret = -EINVAL;
-			goto end;
-		}
-		break;
-	default:
-		ERR("Unknown consumer_data type");
-		assert(0);
-	}
-
 	/* Handle stream on the relayd if the output is on the network */
 	if (relayd) {
 		unsigned long netlen = len;
@@ -1803,7 +1773,7 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 	 * 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, mmap_base + mmap_offset, len);
+	ret = lttng_write(outfd, buffer, len);
 	DBG("Consumer mmap write() ret %zd (len %lu)", ret, len);
 	if (ret < 0 || ((size_t) ret != len)) {
 		/*
@@ -3953,8 +3923,18 @@ int consumer_flush_buffer(struct lttng_consumer_stream *stream, int producer_act
 		} else {
 			ret = kernctl_buffer_flush_empty(stream->wait_fd);
 			if (ret < 0) {
-				ERR("Failed to flush kernel stream");
-				goto end;
+				/*
+				 * Doing a buffer flush which does not take into
+				 * account empty packets. This is not perfect,
+				 * but required as a fall-back when
+				 * "flush_empty" is not implemented by
+				 * lttng-modules.
+				 */
+				ret = kernctl_buffer_flush(stream->wait_fd);
+				if (ret < 0) {
+					ERR("Failed to flush kernel stream");
+					goto end;
+				}
 			}
 		}
 		break;
@@ -4193,7 +4173,7 @@ int consumer_clear_buffer(struct lttng_consumer_stream *stream)
 	case LTTNG_CONSUMER_KERNEL:
 		ret = kernctl_buffer_clear(stream->wait_fd);
 		if (ret < 0) {
-			ERR("Failed to flush kernel stream");
+			ERR("Failed to clear kernel stream (ret = %d)", ret);
 			goto end;
 		}
 		break;
@@ -4272,11 +4252,6 @@ error_unlock:
 	pthread_mutex_unlock(&stream->lock);
 	pthread_mutex_unlock(&channel->lock);
 	rcu_read_unlock();
-	if (ret) {
-		goto error;
-	}
-	ret = LTTCOMM_CONSUMERD_SUCCESS;
-error:
 	return ret;
 }