X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-kernel.c;h=4d2870addacbcb515e0fe1a8042752c2d5fb158f;hp=c1104fac2cc903f53f9d387d8981778cbbc3b780;hb=3e230f922d67f7a47b66631f7a8cf458002b3727;hpb=00e2e675d54dc726a7c8f8887c889cc8ef022003

diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c
index c1104fac2..4d2870add 100644
--- a/src/bin/lttng-sessiond/trace-kernel.c
+++ b/src/bin/lttng-sessiond/trace-kernel.c
@@ -86,13 +86,13 @@ error:
 struct ltt_kernel_session *trace_kernel_create_session(char *path)
 {
 	int ret;
-	struct ltt_kernel_session *lks;
+	struct ltt_kernel_session *lks = NULL;
 
 	/* Allocate a new ltt kernel session */
 	lks = zmalloc(sizeof(struct ltt_kernel_session));
 	if (lks == NULL) {
 		PERROR("create kernel session zmalloc");
-		goto error;
+		goto alloc_error;
 	}
 
 	/* Init data structure */
@@ -101,10 +101,8 @@ struct ltt_kernel_session *trace_kernel_create_session(char *path)
 	lks->channel_count = 0;
 	lks->stream_count_global = 0;
 	lks->metadata = NULL;
-	lks->consumer_fd = -1;
 	CDS_INIT_LIST_HEAD(&lks->channel_list.head);
 
-	/* Create default consumer output object */
 	lks->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
 	if (lks->consumer == NULL) {
 		goto error;
@@ -118,23 +116,29 @@ struct ltt_kernel_session *trace_kernel_create_session(char *path)
 	 */
 	lks->tmp_consumer = NULL;
 
-	/* Use the default consumer output which is the tracing session path. */
-	ret = snprintf(lks->consumer->dst.trace_path, PATH_MAX, "%s/kernel", path);
-	if (ret < 0) {
-		PERROR("snprintf consumer trace path");
-		goto error;
-	}
+	if (path && strlen(path) > 0) {
+		/* Use the default consumer output which is the tracing session path. */
+		ret = snprintf(lks->consumer->dst.trace_path, PATH_MAX,
+				"%s" DEFAULT_KERNEL_TRACE_DIR, path);
+		if (ret < 0) {
+			PERROR("snprintf consumer trace path");
+			goto error;
+		}
 
-	/* Set session path */
-	ret = asprintf(&lks->trace_path, "%s/kernel", path);
-	if (ret < 0) {
-		PERROR("asprintf kernel traces path");
-		goto error;
+		/* Set session path */
+		ret = asprintf(&lks->trace_path, "%s" DEFAULT_KERNEL_TRACE_DIR, path);
+		if (ret < 0) {
+			PERROR("asprintf kernel traces path");
+			goto error;
+		}
 	}
 
 	return lks;
 
 error:
+	free(lks);
+
+alloc_error:
 	return NULL;
 }
 
@@ -254,7 +258,7 @@ error:
  *
  * Return pointer to structure or NULL.
  */
-struct ltt_kernel_metadata *trace_kernel_create_metadata(char *path)
+struct ltt_kernel_metadata *trace_kernel_create_metadata(void)
 {
 	struct ltt_kernel_metadata *lkm;
 	struct lttng_channel *chan;
@@ -268,7 +272,7 @@ struct ltt_kernel_metadata *trace_kernel_create_metadata(char *path)
 
 	/* Set default attributes */
 	chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
-	chan->attr.subbuf_size = DEFAULT_METADATA_SUBBUF_SIZE;
+	chan->attr.subbuf_size = default_get_metadata_subbuf_size();
 	chan->attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
 	chan->attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
 	chan->attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;