X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=d52d9aa62f4e997b327fe2d1ec336ed5414392f8;hp=dd815c44536fd8629d01537d6a6d749f70033147;hb=2f77fc4b3720dc8f75847130498c2d4aad7c03ec;hpb=4222434939b65c3abf144866564732d7fd14ed13

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index dd815c445..d52d9aa62 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -22,11 +22,13 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <inttypes.h>
 
 #include <common/common.h>
 #include <common/kernel-ctl/kernel-ctl.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 
+#include "consumer.h"
 #include "kernel.h"
 #include "kern-modules.h"
 
@@ -150,6 +152,12 @@ int kernel_create_channel(struct ltt_kernel_session *session,
 		goto error;
 	}
 
+	DBG3("Kernel create channel %s in %s with attr: %d, %" PRIu64 ", %" PRIu64 ", %u, %u, %d",
+			chan->name, path, lkc->channel->attr.overwrite,
+			lkc->channel->attr.subbuf_size, lkc->channel->attr.num_subbuf,
+			lkc->channel->attr.switch_timer_interval, lkc->channel->attr.read_timer_interval,
+			lkc->channel->attr.output);
+
 	/* Kernel tracer channel creation */
 	ret = kernctl_create_channel(session->fd, &lkc->channel->attr);
 	if (ret < 0) {
@@ -169,8 +177,7 @@ int kernel_create_channel(struct ltt_kernel_session *session,
 	cds_list_add(&lkc->list, &session->channel_list.head);
 	session->channel_count++;
 
-	DBG("Kernel channel %s created (fd: %d and path: %s)",
-			lkc->channel->name, lkc->fd, lkc->pathname);
+	DBG("Kernel channel %s created (fd: %d)", lkc->channel->name, lkc->fd);
 
 	return 0;
 
@@ -196,7 +203,13 @@ int kernel_create_event(struct lttng_event *ev,
 
 	ret = kernctl_create_event(channel->fd, event->event);
 	if (ret < 0) {
-		if (errno != EEXIST) {
+		switch (errno) {
+		case EEXIST:
+			break;
+		case ENOSYS:
+			WARN("Event type not implemented");
+			break;
+		default:
 			PERROR("create event ioctl");
 		}
 		ret = -errno;
@@ -345,13 +358,13 @@ error:
  * Create kernel metadata, open from the kernel tracer and add it to the
  * kernel session.
  */
-int kernel_open_metadata(struct ltt_kernel_session *session, char *path)
+int kernel_open_metadata(struct ltt_kernel_session *session)
 {
 	int ret;
 	struct ltt_kernel_metadata *lkm;
 
 	/* Allocate kernel metadata */
-	lkm = trace_kernel_create_metadata(path);
+	lkm = trace_kernel_create_metadata();
 	if (lkm == NULL) {
 		goto error;
 	}
@@ -371,7 +384,7 @@ int kernel_open_metadata(struct ltt_kernel_session *session, char *path)
 
 	session->metadata = lkm;
 
-	DBG("Kernel metadata opened (fd: %d and path: %s)", lkm->fd, lkm->pathname);
+	DBG("Kernel metadata opened (fd: %d)", lkm->fd);
 
 	return 0;
 
@@ -442,7 +455,7 @@ int kernel_metadata_flush_buffer(int fd)
 
 	ret = kernctl_buffer_flush(fd);
 	if (ret < 0) {
-		ERR("Fail to flush metadata buffers %d (ret: %d", fd, ret);
+		ERR("Fail to flush metadata buffers %d (ret: %d)", fd, ret);
 	}
 
 	return 0;
@@ -499,11 +512,11 @@ error:
  */
 int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
 {
-	int ret;
+	int ret, count = 0;
 	struct ltt_kernel_stream *lks;
 
 	while ((ret = kernctl_create_stream(channel->fd)) >= 0) {
-		lks = trace_kernel_create_stream();
+		lks = trace_kernel_create_stream(channel->channel->name, count);
 		if (lks == NULL) {
 			ret = close(ret);
 			if (ret) {
@@ -519,19 +532,15 @@ int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
 			PERROR("fcntl session fd");
 		}
 
-		ret = asprintf(&lks->pathname, "%s/%s_%d",
-				channel->pathname, channel->channel->name, channel->stream_count);
-		if (ret < 0) {
-			PERROR("asprintf kernel create stream");
-			goto error;
-		}
-
 		/* Add stream to channe stream list */
 		cds_list_add(&lks->list, &channel->stream_list.head);
 		channel->stream_count++;
 
-		DBG("Kernel stream %d created (fd: %d, state: %d, path: %s)",
-				channel->stream_count, lks->fd, lks->state, lks->pathname);
+		/* Increment counter which represent CPU number. */
+		count++;
+
+		DBG("Kernel stream %s created (fd: %d, state: %d)", lks->name, lks->fd,
+				lks->state);
 	}
 
 	return channel->stream_count;
@@ -597,24 +606,35 @@ ssize_t kernel_list_events(int tracer_fd, struct lttng_event **events)
 	 */
 	nbmem = KERNEL_EVENT_INIT_LIST_SIZE;
 	elist = zmalloc(sizeof(struct lttng_event) * nbmem);
+	if (elist == NULL) {
+		PERROR("alloc list events");
+		count = -ENOMEM;
+		goto end;
+	}
 
 	while ((size = fscanf(fp, "event { name = %m[^;]; };%n\n", &event, &pos)) == 1) {
 		if (count >= nbmem) {
+			struct lttng_event *new_elist;
+
 			DBG("Reallocating event list from %zu to %zu bytes", nbmem,
 					nbmem * 2);
 			/* Double the size */
 			nbmem <<= 1;
-			elist = realloc(elist, nbmem * sizeof(struct lttng_event));
-			if (elist == NULL) {
+			new_elist = realloc(elist, nbmem * sizeof(struct lttng_event));
+			if (new_elist == NULL) {
 				PERROR("realloc list events");
+				free(event);
+				free(elist);
 				count = -ENOMEM;
 				goto end;
 			}
+			elist = new_elist;
 		}
 		strncpy(elist[count].name, event, LTTNG_SYMBOL_NAME_LEN);
 		elist[count].name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
 		elist[count].enabled = -1;
 		count++;
+		free(event);
 	}
 
 	*events = elist;
@@ -699,3 +719,21 @@ int init_kernel_workarounds(void)
 end_boot_id:
 	return 0;
 }
+
+/*
+ * Complete teardown of a kernel session.
+ */
+void kernel_destroy_session(struct ltt_kernel_session *ksess)
+{
+	if (ksess == NULL) {
+		DBG3("No kernel session when tearing down session");
+		return;
+	}
+
+	DBG("Tearing down kernel session");
+
+	/* Close any relayd session */
+	consumer_output_send_destroy_relayd(ksess->consumer);
+
+	trace_kernel_destroy_session(ksess);
+}