X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=daa4a7391b2bca552efd7caf391528e14d4ed968;hb=9039edd4983b46fc45dae7ed42396ef7f7e5635a;hp=d8d5db6c7ff6838d087309c421c83cb919e0758c;hpb=27babd3a0a164f71d4dc02884ef20099ddfc6755;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index d8d5db6c7..daa4a7391 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -574,6 +574,7 @@ static int _lttng_stop_tracing(const char *session_name, int wait)
 	}
 
 	_MSG("Waiting for data availability");
+	fflush(stdout);
 
 	/* Check for data availability */
 	do {
@@ -591,6 +592,7 @@ static int _lttng_stop_tracing(const char *session_name, int wait)
 		if (data_ret) {
 			usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME);
 			_MSG(".");
+			fflush(stdout);
 		}
 	} while (data_ret != 0);
 
@@ -640,9 +642,14 @@ int lttng_add_context(struct lttng_handle *handle,
 
 	lsm.cmd_type = LTTNG_ADD_CONTEXT;
 
-	/* Copy channel name */
-	lttng_ctl_copy_string(lsm.u.context.channel_name, channel_name,
-			sizeof(lsm.u.context.channel_name));
+	/* If no channel name, send empty string. */
+	if (channel_name == NULL) {
+		lttng_ctl_copy_string(lsm.u.context.channel_name, "",
+				sizeof(lsm.u.context.channel_name));
+	} else {
+		lttng_ctl_copy_string(lsm.u.context.channel_name, channel_name,
+				sizeof(lsm.u.context.channel_name));
+	}
 
 	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
 
@@ -671,9 +678,9 @@ int lttng_enable_event(struct lttng_handle *handle,
 
 	memset(&lsm, 0, sizeof(lsm));
 
-	/* If no channel name, we put the default name */
+	/* If no channel name, send empty string. */
 	if (channel_name == NULL) {
-		lttng_ctl_copy_string(lsm.u.enable.channel_name, DEFAULT_CHANNEL_NAME,
+		lttng_ctl_copy_string(lsm.u.enable.channel_name, "",
 				sizeof(lsm.u.enable.channel_name));
 	} else {
 		lttng_ctl_copy_string(lsm.u.enable.channel_name, channel_name,
@@ -800,9 +807,15 @@ int lttng_enable_event_with_filter(struct lttng_handle *handle,
 
 	lsm.cmd_type = LTTNG_ENABLE_EVENT_WITH_FILTER;
 
-	/* Copy channel name */
-	lttng_ctl_copy_string(lsm.u.enable.channel_name, channel_name,
-			sizeof(lsm.u.enable.channel_name));
+	/* If no channel name, send empty string. */
+	if (channel_name == NULL) {
+		lttng_ctl_copy_string(lsm.u.enable.channel_name, "",
+				sizeof(lsm.u.enable.channel_name));
+	} else {
+		lttng_ctl_copy_string(lsm.u.enable.channel_name, channel_name,
+				sizeof(lsm.u.enable.channel_name));
+	}
+
 	/* Copy event name */
 	if (event) {
 		memcpy(&lsm.u.enable.event, event, sizeof(lsm.u.enable.event));
@@ -855,11 +868,12 @@ int lttng_disable_event(struct lttng_handle *handle, const char *name,
 
 	memset(&lsm, 0, sizeof(lsm));
 
-	if (channel_name) {
-		lttng_ctl_copy_string(lsm.u.disable.channel_name, channel_name,
+	/* If no channel name, send empty string. */
+	if (channel_name == NULL) {
+		lttng_ctl_copy_string(lsm.u.disable.channel_name, "",
 				sizeof(lsm.u.disable.channel_name));
 	} else {
-		lttng_ctl_copy_string(lsm.u.disable.channel_name, DEFAULT_CHANNEL_NAME,
+		lttng_ctl_copy_string(lsm.u.disable.channel_name, channel_name,
 				sizeof(lsm.u.disable.channel_name));
 	}