X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=97a9c77e81f6974625877c67b4e125fde692d9e4;hp=e07d27e678b93c718ff3dee1378706b3382a3692;hb=5d2e1e66a968d9e555f9b8b00d0589ebfaf3de32;hpb=2223c96f0eecce28fe221eb19de4333156492337

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index e07d27e67..97a9c77e8 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -216,7 +216,7 @@ struct ltt_ust_session *trace_ust_create_session(char *path,
 	lus->tmp_consumer = NULL;
 
 	/* Use the default consumer output which is the tracing session path. */
-	if (path && strlen(path) > 0) {
+	if (*path != '\0') {
 		int ret;
 
 		ret = snprintf(lus->consumer->dst.trace_path, PATH_MAX,
@@ -412,13 +412,13 @@ struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
 	lum->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
 	lum->attr.subbuf_size = default_get_metadata_subbuf_size();
 	lum->attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
-	lum->attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
-	lum->attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
+	lum->attr.switch_timer_interval = DEFAULT_UST_CHANNEL_SWITCH_TIMER;
+	lum->attr.read_timer_interval = DEFAULT_UST_CHANNEL_READ_TIMER;
 	lum->attr.output = LTTNG_UST_MMAP;
 
 	lum->handle = -1;
 	/* Set metadata trace path */
-	ret = snprintf(lum->pathname, PATH_MAX, "%s/metadata", path);
+	ret = snprintf(lum->pathname, PATH_MAX, "%s/" DEFAULT_METADATA_NAME, path);
 	if (ret < 0) {
 		PERROR("asprintf ust metadata");
 		goto error_free_metadata;