X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-kernel.c;h=363d010a1a2aed47213e51ae240ed3a00fd5d460;hp=33e5488ef293fde00f2841094f17d92e15e0a834;hb=535b8ff4d115dfc5be97d9d90fd36ca772b10e87;hpb=91b23e997053fb552662f1ad07273f029e00d2e4

diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c
index 33e5488ef..363d010a1 100644
--- a/src/bin/lttng-sessiond/trace-kernel.c
+++ b/src/bin/lttng-sessiond/trace-kernel.c
@@ -38,6 +38,13 @@ struct ltt_kernel_channel *trace_kernel_get_channel_by_name(
 	assert(session);
 	assert(name);
 
+	/*
+	 * If we receive an empty string for channel name, it means the
+	 * default channel name is requested.
+	 */
+	if (name[0] == '\0')
+		name = DEFAULT_CHANNEL_NAME;
+
 	DBG("Trying to find channel %s", name);
 
 	cds_list_for_each_entry(chan, &session->channel_list.head, list) {
@@ -144,6 +151,16 @@ struct ltt_kernel_channel *trace_kernel_create_channel(
 	}
 	memcpy(lkc->channel, chan, sizeof(struct lttng_channel));
 
+	/*
+	 * If we receive an empty string for channel name, it means the
+	 * default channel name is requested.
+	 */
+	if (chan->name[0] == '\0') {
+		strncpy(lkc->channel->name, DEFAULT_CHANNEL_NAME,
+			sizeof(lkc->channel->name));
+	}
+	lkc->channel->name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
+
 	lkc->fd = -1;
 	lkc->stream_count = 0;
 	lkc->event_count = 0;
@@ -290,7 +307,7 @@ struct ltt_kernel_stream *trace_kernel_create_stream(const char *name,
 	}
 
 	/* Set name */
-	ret = snprintf(lks->name, sizeof(lks->name), "%s_%d", name, count);
+	ret = snprintf(lks->name, sizeof(lks->name), "%s_%u", name, count);
 	if (ret < 0) {
 		PERROR("snprintf stream name");
 		goto error;