X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=37a803b05ff12d399bb9d6de6a1c8bafe9fb2b2f;hp=e4e03e88cd3905a0e1321eed49199cc0ab5368e1;hb=784303b0777959c71c7f6ad404fea1ed3cc22f14;hpb=9b6c7ec5aebd1b1e3610ea54bbd0d6d4e9efaa82

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index e4e03e88c..37a803b05 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -101,11 +101,22 @@ static int build_network_session_path(char *dst, size_t size,
 		goto error;
 	}
 
+	/*
+	 * Do we have a UST url set. If yes, this means we have both kernel and UST
+	 * to print.
+	 */
 	if (strlen(tmp_uurl) > 0) {
 		ret = snprintf(dst, size, "[K]: %s [data: %d] -- [U]: %s [data: %d]",
 				tmp_urls, kdata_port, tmp_uurl, udata_port);
 	} else {
-		ret = snprintf(dst, size, "%s [data: %d]", tmp_urls, kdata_port);
+		int dport;
+		if (kuri) {
+			dport = kdata_port;
+		} else {
+			/* No kernel URI, use the UST port. */
+			dport = udata_port;
+		}
+		ret = snprintf(dst, size, "%s [data: %d]", tmp_urls, dport);
 	}
 
 error:
@@ -725,7 +736,7 @@ static int start_kernel_session(struct ltt_kernel_session *ksess, int wpipe)
 	}
 
 	/* Quiescent wait after starting trace */
-	kernel_wait_quiescent(wpipe);
+	kernel_wait_quiescent(kernel_tracer_fd);
 
 	ksess->started = 1;
 
@@ -830,7 +841,7 @@ int cmd_enable_channel(struct ltt_session *session,
 			goto error;
 		}
 
-		kernel_wait_quiescent(wpipe);
+		kernel_wait_quiescent(kernel_tracer_fd);
 
 		/*
 		 * If the session was previously started, start as well this newly