X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng%2Flttng.c;h=b08ecfed8af6debe14aeff7d4f35eb691cc42cd5;hb=aaf975194bf54e911e7464b3723b2f247dbeb78b;hp=095ebe5e1c898343b86d177bfd39a926115b3090;hpb=5716705821202372fd16168f66f347ba293ef6b4;p=lttng-tools.git

diff --git a/lttng/lttng.c b/lttng/lttng.c
index 095ebe5e1..b08ecfed8 100644
--- a/lttng/lttng.c
+++ b/lttng/lttng.c
@@ -42,6 +42,7 @@ static char *progname;
 static int process_client_opt(void);
 static int process_opt_list_apps(void);
 static int process_opt_list_sessions(void);
+static int process_opt_create_session(void);
 static void sighandler(int sig);
 static int set_signal_handler(void);
 
@@ -76,6 +77,13 @@ static int process_client_opt(void)
 		}
 	}
 
+	if (opt_create_session != NULL) {
+		ret = process_opt_create_session();
+		if (ret < 0) {
+			goto end;
+		}
+	}
+
 	return 0;
 
 end:
@@ -83,6 +91,29 @@ end:
 	return ret;
 }
 
+/*
+ *  process_opt_create_session
+ *
+ *  Create a new session using the name pass
+ *  to the command line.
+ */
+static int process_opt_create_session(void)
+{
+	int ret;
+	char *session_id;
+
+	ret = lttng_create_session(opt_create_session, &session_id);
+	if (ret < 0) {
+		goto error;
+	}
+
+	MSG("Session created:");
+	MSG("    %s (%s)", opt_create_session, session_id);
+
+error:
+	return ret;
+}
+
 /*
  *  process_opt_list_sessions
  *
@@ -122,22 +153,24 @@ error:
  */
 static int process_opt_list_apps(void)
 {
-	int i, ret;
+	int i, ret, count;
 	pid_t *pids;
 	FILE *fp;
 	char path[24];	/* Can't go bigger than /proc/65535/cmdline */
 	char cmdline[PATH_MAX];
 
-	ret = lttng_ust_list_apps(&pids);
-	if (ret < 0) {
+	count = lttng_ust_list_apps(&pids);
+	if (count < 0) {
+		ret = count;
 		goto error;
 	}
 
 	MSG("LTTng UST traceable application [name (pid)]:");
-	for (i=0; i < ret; i++) {
+	for (i=0; i < count; i++) {
 		snprintf(path, sizeof(path), "/proc/%d/cmdline", pids[i]);
 		fp = fopen(path, "r");
 		if (fp == NULL) {
+			MSG("\t(not running) (%d)", pids[i]);
 			continue;
 		}
 		ret = fread(cmdline, 1, sizeof(cmdline), fp);
@@ -170,7 +203,7 @@ static int spawn_sessiond(char *pathname)
 		/* Spawn session daemon and tell
 		 * it to signal us when ready.
 		 */
-		ret = execlp(pathname, "ltt-sessiond", "--sig-parent", NULL);
+		ret = execlp(pathname, "ltt-sessiond", "--sig-parent", "--quiet", NULL);
 		if (ret < 0) {
 			if (errno == ENOENT) {
 				ERR("No session daemon found. Use --sessiond-path.");
@@ -219,7 +252,13 @@ static int check_ltt_sessiond(void)
 			pathname = opt_sessiond_path;
 		} else {
 			/* Try LTTNG_SESSIOND_PATH env variable */
-			pathname = strdup(getenv(LTTNG_SESSIOND_PATH_ENV));
+			pathname = getenv(LTTNG_SESSIOND_PATH_ENV);
+			if (pathname != NULL) {
+				/* strdup here in order to make the free()
+				 * not fail later on.
+				 */
+				pathname = strdup(pathname);
+			}
 		}
 
 		/* Let's rock and roll */