X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-kconsumerd%2Fltt-kconsumerd.c;h=a81be55e7c9dbdaed5daf63c2c68d4c6280ac1a8;hp=ca939656b7c888d84173d460aa4582d6bbad2e22;hb=558e70e9829c97ecd228516f6e312768be0536d7;hpb=81ffcd20d37d0d99b2676a7eabb0f0bf42c54e69

diff --git a/ltt-kconsumerd/ltt-kconsumerd.c b/ltt-kconsumerd/ltt-kconsumerd.c
index ca939656b..a81be55e7 100644
--- a/ltt-kconsumerd/ltt-kconsumerd.c
+++ b/ltt-kconsumerd/ltt-kconsumerd.c
@@ -36,13 +36,13 @@
 #include <poll.h>
 #include <unistd.h>
 #include <sys/mman.h>
+#include <assert.h>
 
+#include <ltt-kconsumerd.h>
+#include <lttng-kernel-ctl.h>
+#include <lttng-sessiond-comm.h>
 #include <lttng/lttng-kconsumerd.h>
-
-#include "lttngerr.h"
-#include "kernelctl.h"
-#include "ltt-kconsumerd.h"
-#include "lttng-sessiond-comm.h"
+#include <lttngerr.h>
 
 /* the two threads (receive fd and poll) */
 static pthread_t threads[2];
@@ -277,6 +277,57 @@ end:
 	return ret;
 }
 
+static int on_recv_fd(struct lttng_kconsumerd_fd *kconsumerd_fd)
+{
+	int ret;
+
+	/* Opening the tracefile in write mode */
+	if (kconsumerd_fd->path_name != NULL) {
+		ret = open(kconsumerd_fd->path_name,
+				O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU|S_IRWXG|S_IRWXO);
+		if (ret < 0) {
+			ERR("Opening %s", kconsumerd_fd->path_name);
+			perror("open");
+			goto error;
+		}
+		kconsumerd_fd->out_fd = ret;
+	}
+
+	if (kconsumerd_fd->output == LTTNG_EVENT_MMAP) {
+		/* get the len of the mmap region */
+		unsigned long mmap_len;
+
+		ret = kernctl_get_mmap_len(kconsumerd_fd->consumerd_fd, &mmap_len);
+		if (ret != 0) {
+			ret = errno;
+			perror("kernctl_get_mmap_len");
+			goto error_close_fd;
+		}
+		kconsumerd_fd->mmap_len = (size_t) mmap_len;
+
+		kconsumerd_fd->mmap_base = mmap(NULL, kconsumerd_fd->mmap_len,
+				PROT_READ, MAP_PRIVATE, kconsumerd_fd->consumerd_fd, 0);
+		if (kconsumerd_fd->mmap_base == MAP_FAILED) {
+			perror("Error mmaping");
+			ret = -1;
+			goto error_close_fd;
+		}
+	}
+
+	/* we return 0 to let the library handle the FD internally */
+	return 0;
+
+error_close_fd:
+	{
+		int err;
+
+		err = close(kconsumerd_fd->out_fd);
+		assert(!err);
+	}
+error:
+	return ret;
+}
+
 /*
  * main
  */
@@ -303,8 +354,8 @@ int main(int argc, char **argv)
 		snprintf(command_sock_path, PATH_MAX,
 				KCONSUMERD_CMD_SOCK_PATH);
 	}
-	/* create the pipe to wake to receiving thread when needed */
-	ctx = lttng_kconsumerd_create(read_subbuffer);
+	/* create the consumer instance with and assign the callbacks */
+	ctx = lttng_kconsumerd_create(read_subbuffer, on_recv_fd, NULL);
 	if (ctx == NULL) {
 		goto error;
 	}