X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Flttng.c;h=3c3747de1f002a971ab64794f4a6f8ffe68a8036;hp=b08ecfed8af6debe14aeff7d4f35eb691cc42cd5;hb=7442b2ba0c15bf9c950b96a19e948243c2b57683;hpb=aaf975194bf54e911e7464b3723b2f247dbeb78b

diff --git a/lttng/lttng.c b/lttng/lttng.c
index b08ecfed8..3c3747de1 100644
--- a/lttng/lttng.c
+++ b/lttng/lttng.c
@@ -30,21 +30,27 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <lttng/liblttngctl.h>
+#include <lttng/lttng.h>
 
 #include "lttng.h"
 #include "lttngerr.h"
 
 /* Variables */
 static char *progname;
+static char short_uuid[9];
 
 /* Prototypes */
 static int process_client_opt(void);
 static int process_opt_list_apps(void);
 static int process_opt_list_sessions(void);
+static int process_opt_list_traces(void);
 static int process_opt_create_session(void);
+static int process_opt_session_uuid(void);
 static void sighandler(int sig);
+static void shorten_uuid(char *in, char *out);
 static int set_signal_handler(void);
+static int validate_options(void);
+static char *get_cmdline_by_pid(pid_t pid);
 
 /*
  *  start_client
@@ -56,12 +62,7 @@ static int set_signal_handler(void);
 static int process_client_opt(void)
 {
 	int ret;
-
-	/* Connect to the session daemon */
-	ret = lttng_connect_sessiond();
-	if (ret < 0) {
-		goto end;
-	}
+	uuid_t uuid;
 
 	if (opt_list_apps) {
 		ret = process_opt_list_apps();
@@ -77,6 +78,13 @@ static int process_client_opt(void)
 		}
 	}
 
+	if (opt_list_traces) {
+		ret = process_opt_list_traces();
+		if (ret < 0) {
+			goto end;
+		}
+	}
+
 	if (opt_create_session != NULL) {
 		ret = process_opt_create_session();
 		if (ret < 0) {
@@ -84,11 +92,137 @@ static int process_client_opt(void)
 		}
 	}
 
+	if (opt_destroy_session != NULL) {
+		uuid_parse(opt_destroy_session, uuid);
+		ret = lttng_destroy_session(&uuid);
+		if (ret < 0) {
+			goto end;
+		}
+	}
+
+	if (opt_session_uuid != NULL) {
+		DBG("Set session uuid to %s", short_uuid);
+		ret = process_opt_session_uuid();
+		if (ret < 0) {
+			ERR("Session UUID %s not found", opt_session_uuid);
+			goto error;
+		}
+	}
+
+	if (opt_trace_kernel) {
+		ERR("Not implemented yet");
+		goto end;
+	}
+
+	if (opt_trace_pid != 0) {
+		if (opt_create_trace) {
+			DBG("Create a userspace trace for pid %d", opt_trace_pid);
+			ret = lttng_ust_create_trace(opt_trace_pid);
+			if (ret < 0) {
+				goto end;
+			}
+			MSG("Trace created successfully!\nUse --start to start tracing.");
+		}
+
+		if (opt_start_trace) {
+			DBG("Start trace for pid %d", opt_trace_pid);
+			ret = lttng_ust_start_trace(opt_trace_pid);
+			if (ret < 0) {
+				goto end;
+			}
+			MSG("Trace started successfully!");
+		} else if (opt_stop_trace) {
+			DBG("Stop trace for pid %d", opt_trace_pid);
+			ret = lttng_ust_stop_trace(opt_trace_pid);
+			if (ret < 0) {
+				goto end;
+			}
+			MSG("Trace stopped successfully!");
+		}
+
+	}
+
 	return 0;
 
 end:
 	ERR("%s", lttng_get_readable_code(ret));
 	return ret;
+
+error:
+	return ret;
+}
+
+/*
+ *  process_opt_session_uuid
+ *
+ *  Set current session uuid to the current flow of
+ *  command(s) using the already shorten uuid.
+ */
+static int process_opt_session_uuid(void)
+{
+	int ret, count, i;
+	struct lttng_session *sessions;
+
+	count = lttng_list_sessions(&sessions);
+	if (count < 0) {
+		ret = count;
+		goto error;
+	}
+
+	for (i = 0; i < count; i++) {
+		if (strncmp(sessions[i].uuid, short_uuid, 8) == 0) {
+			lttng_set_current_session_uuid(sessions[i].uuid);
+			break;
+		}
+	}
+
+	free(sessions);
+
+	return 0;
+
+error:
+	return ret;
+}
+
+/*
+ *  process_opt_list_traces
+ *
+ *  Get list of all traces for a specific session uuid.
+ */
+static int process_opt_list_traces(void)
+{
+	int ret, i;
+	uuid_t uuid;
+	struct lttng_trace *traces;
+
+	uuid_parse(opt_session_uuid, uuid);
+	ret = lttng_list_traces(&uuid, &traces);
+	if (ret < 0) {
+		goto error;
+	}
+
+	MSG("Userspace traces:");
+	for (i = 0; i < ret; i++) {
+		if (traces[i].type == USERSPACE) {
+			MSG("\t%d) %s (pid: %d): %s",
+					i, traces[i].name, traces[i].pid,
+					get_cmdline_by_pid(traces[i].pid));
+		} else {
+			break;
+		}
+	}
+
+	MSG("Kernel traces:");
+	for (;i < ret; i++) {
+		if (traces[i].type == KERNEL) {
+			MSG("\t%d) %s", i, traces[i].name);
+		}
+	}
+
+	free(traces);
+
+error:
+	return ret;
 }
 
 /*
@@ -100,20 +234,55 @@ end:
 static int process_opt_create_session(void)
 {
 	int ret;
-	char *session_id;
+	uuid_t session_id;
+	char str_uuid[37];
 
 	ret = lttng_create_session(opt_create_session, &session_id);
 	if (ret < 0) {
 		goto error;
 	}
 
+	uuid_unparse(session_id, str_uuid);
+
 	MSG("Session created:");
-	MSG("    %s (%s)", opt_create_session, session_id);
+	MSG("    %s (%s)", opt_create_session, str_uuid);
 
 error:
 	return ret;
 }
 
+/*
+ *  extract_short_uuid
+ *
+ *  Extract shorten uuid and copy it to out.
+ *  Shorten uuid format : '<name>.<short_uuid>'
+ */
+static int extract_short_uuid(char *in, char *out)
+{
+	char *tok;
+
+	tok = strchr(in, '.');
+	if (strlen(tok+1) == 8) {
+		memcpy(out, tok+1, 8);
+		out[9] = '\0';
+		return 0;
+	}
+
+	return -1;
+}
+
+/*
+ * shorten_uuid
+ *
+ * Small function to shorten the 37 bytes long uuid_t
+ * string representation to 8 characters.
+ */
+static void shorten_uuid(char *in, char *out)
+{
+	memcpy(out, in, 8);
+	out[8] = '\0';
+}
+
 /*
  *  process_opt_list_sessions
  *
@@ -123,21 +292,24 @@ error:
 static int process_opt_list_sessions(void)
 {
 	int ret, count, i;
+	char tmp_short_uuid[9];
 	struct lttng_session *sess;
 
 	count = lttng_list_sessions(&sess);
+	DBG("Session count %d", count);
 	if (count < 0) {
 		ret = count;
 		goto error;
 	}
 
-	MSG("Available sessions [Name (uuid)]:");
+	MSG("Available sessions (UUIDs):");
 	for (i = 0; i < count; i++) {
-		MSG("\tName: %s (uuid: %s)", sess[i].name, sess[i].uuid);
+		shorten_uuid(sess[i].uuid, tmp_short_uuid);
+		MSG("    %d) %s.%s", i+1, sess[i].name, tmp_short_uuid);
 	}
 
 	free(sess);
-	MSG("\nTo select a session, use --session UUID.");
+	MSG("\nTo select a session, use -s, --session UUID.");
 
 	return 0;
 
@@ -155,9 +327,7 @@ static int process_opt_list_apps(void)
 {
 	int i, ret, count;
 	pid_t *pids;
-	FILE *fp;
-	char path[24];	/* Can't go bigger than /proc/65535/cmdline */
-	char cmdline[PATH_MAX];
+	char *cmdline;
 
 	count = lttng_ust_list_apps(&pids);
 	if (count < 0) {
@@ -167,15 +337,13 @@ static int process_opt_list_apps(void)
 
 	MSG("LTTng UST traceable application [name (pid)]:");
 	for (i=0; i < count; i++) {
-		snprintf(path, sizeof(path), "/proc/%d/cmdline", pids[i]);
-		fp = fopen(path, "r");
-		if (fp == NULL) {
+		cmdline = get_cmdline_by_pid(pids[i]);
+		if (cmdline == NULL) {
 			MSG("\t(not running) (%d)", pids[i]);
 			continue;
 		}
-		ret = fread(cmdline, 1, sizeof(cmdline), fp);
 		MSG("\t%s (%d)", cmdline, pids[i]);
-		fclose(fp);
+		free(cmdline);
 	}
 
 	/* Allocated by lttng_ust_list_apps() */
@@ -187,6 +355,80 @@ error:
 	return ret;
 }
 
+/*
+ *  get_cmdline_by_pid
+ *
+ *  Get command line from /proc for a specific pid.
+ *
+ *  On success, return an allocated string pointer pointing to
+ *  the proc cmdline.
+ *  On error, return NULL.
+ */
+static char *get_cmdline_by_pid(pid_t pid)
+{
+	int ret;
+	FILE *fp;
+	char *cmdline = NULL;
+	char path[24];	/* Can't go bigger than /proc/65535/cmdline */
+
+	snprintf(path, sizeof(path), "/proc/%d/cmdline", pid);
+	fp = fopen(path, "r");
+	if (fp == NULL) {
+		goto end;
+	}
+
+	/* Caller must free() *cmdline */
+	cmdline = malloc(PATH_MAX);
+	ret = fread(cmdline, 1, PATH_MAX, fp);
+	fclose(fp);
+
+end:
+	return cmdline;
+}
+
+/*
+ *  validate_options
+ *
+ *  Make sure that all options passed to the command line
+ *  are compatible with each others.
+ *
+ *  On error, return -1
+ *  On success, return 0
+ */
+static int validate_options(void)
+{
+	int ret;
+
+	/* Conflicting command */
+	if (opt_start_trace && opt_stop_trace) {
+		ERR("Can't use --start and --stop together.");
+		goto error;
+	/* Must have a session UUID for trace action. */
+	} else if ((opt_session_uuid == NULL) &&
+			(opt_create_trace || opt_start_trace || opt_stop_trace || opt_list_traces)) {
+		ERR("You need to specify a session UUID.\nPlease use --session UUID to do so.");
+		goto error;
+	/* If no PID specified and trace_kernel is off */
+	} else if ((opt_trace_pid == 0 && opt_trace_kernel == 0) &&
+			(opt_create_trace || opt_start_trace || opt_stop_trace)) {
+		ERR("Please specify a PID using -p, --pid PID.");
+		goto error;
+	}
+
+	if (opt_session_uuid != NULL) {
+		ret = extract_short_uuid(opt_session_uuid, short_uuid);
+		if (ret < 0) {
+			ERR("Session UUID not valid. Must be <name>.<short_uuid>");
+			goto error;
+		}
+	}
+
+	return 0;
+
+error:
+	return -1;
+}
+
 /*
  *  spawn_sessiond
  *
@@ -321,20 +563,23 @@ end:
  */
 static void sighandler(int sig)
 {
-	DBG("%d received", sig);
 	switch (sig) {
 		case SIGTERM:
+			DBG("SIGTERM catched");
 			clean_exit(EXIT_FAILURE);
 			break;
 		case SIGCHLD:
 			/* Notify is done */
+			DBG("SIGCHLD catched");
 			break;
 		default:
+			DBG("Unknown signal %d catched", sig);
 			break;
 	}
 
 	return;
 }
+
 /*
  * clean_exit
  */
@@ -359,13 +604,18 @@ int main(int argc, char *argv[])
 	}
 
 	ret = parse_args(argc, (const char **) argv);
+	if (ret < 0) {
+		clean_exit(EXIT_FAILURE);
+	}
+
+	ret = validate_options();
 	if (ret < 0) {
 		return EXIT_FAILURE;
 	}
 
 	ret = set_signal_handler();
 	if (ret < 0) {
-		return ret;
+		clean_exit(ret);
 	}
 
 	if (opt_tracing_group != NULL) {
@@ -378,7 +628,7 @@ int main(int argc, char *argv[])
 		DBG("Kernel tracing activated");
 		if (getuid() != 0) {
 			ERR("%s must be setuid root", progname);
-			return -EPERM;
+			clean_exit(-EPERM);
 		}
 	}
 
@@ -386,13 +636,15 @@ int main(int argc, char *argv[])
 	 * If no, a daemon will be spawned.
 	 */
 	if (opt_no_sessiond == 0 && (check_ltt_sessiond() < 0)) {
-		return EXIT_FAILURE;
+		clean_exit(EXIT_FAILURE);
 	}
 
 	ret = process_client_opt();
 	if (ret < 0) {
-		return ret;
+		clean_exit(ret);
 	}
 
+	clean_exit(0);
+
 	return 0;
 }