X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Flttng.c;h=40cf52bc6a3b02059a1ea8635c412737f8a5f71f;hp=c7ff4edde334dd5131e1b207c902498cc8fc5ce1;hb=87378cf56f08f23cd6715a923ba10d98343902d7;hpb=e8f07c636c9943a0e2a48113bb8135a6c4f5ebd7

diff --git a/lttng/lttng.c b/lttng/lttng.c
index c7ff4edde..40cf52bc6 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);
 
@@ -55,6 +56,7 @@ static int set_signal_handler(void);
 static int process_client_opt(void)
 {
 	int ret;
+	uuid_t uuid;
 
 	/* Connect to the session daemon */
 	ret = lttng_connect_sessiond();
@@ -76,6 +78,25 @@ static int process_client_opt(void)
 		}
 	}
 
+	if (opt_create_session != NULL) {
+		ret = process_opt_create_session();
+		if (ret < 0) {
+			goto end;
+		}
+	}
+
+	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) {
+		lttng_set_current_session_uuid(opt_session_uuid);
+	}
+
 	return 0;
 
 end:
@@ -83,6 +104,32 @@ 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;
+	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, str_uuid);
+
+error:
+	return ret;
+}
+
 /*
  *  process_opt_list_sessions
  *
@@ -310,6 +357,9 @@ static void sighandler(int sig)
 void clean_exit(int code)
 {
 	DBG("Clean exit");
+	if (lttng_disconnect_sessiond() < 0) {
+		ERR("Session daemon disconnect failed.");
+	}
 	exit(code);
 }
 
@@ -329,12 +379,12 @@ int main(int argc, char *argv[])
 
 	ret = parse_args(argc, (const char **) argv);
 	if (ret < 0) {
-		return EXIT_FAILURE;
+		clean_exit(EXIT_FAILURE);
 	}
 
 	ret = set_signal_handler();
 	if (ret < 0) {
-		return ret;
+		clean_exit(ret);
 	}
 
 	if (opt_tracing_group != NULL) {
@@ -347,7 +397,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);
 		}
 	}
 
@@ -355,13 +405,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;
 }