X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=2eccee5cb9295fd84001a7f7cd39c009b423e92c;hb=7775df526447e504735983ee359dcb902fa6dd1e;hp=89d27a0d9ed8e32aa6511bc1b091a8bbc4881845;hpb=bb09693bc5b9d3123e8dd5a5ac9729597b9ec3c7;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 89d27a0d9..2eccee5cb 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -1671,12 +1671,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 */
@@ -1698,36 +1698,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;
@@ -1804,7 +1774,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)) {
 		/*