X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Foptions.c;h=57cb9b7954677153ee56e3535b510be115818c87;hp=b4630c3d79d3b01c0d90ff420682e2079f6f6a54;hb=96243366860d20e371efed0500070cdbc4a01ec7;hpb=7442b2ba0c15bf9c950b96a19e948243c2b57683

diff --git a/lttng/options.c b/lttng/options.c
index b4630c3d7..57cb9b795 100644
--- a/lttng/options.c
+++ b/lttng/options.c
@@ -24,9 +24,10 @@
 /* Option variables */
 char *opt_tracing_group;
 char *opt_session_uuid;
-char *opt_create_session;
 char *opt_sessiond_path;
-char *opt_destroy_session;
+char *opt_session_name;
+int opt_create_session;
+int opt_destroy_session;
 int opt_trace_kernel = 0;
 int opt_quiet = 0;
 int opt_verbose = 0;
@@ -41,14 +42,16 @@ pid_t opt_trace_pid = 0;
 
 enum {
 	OPT_HELP = 42,
+	OPT_CREATE_SESSION,
+	OPT_DESTROY_SESSION,
 };
 
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-	{"create-session",  'c',	POPT_ARG_STRING,	&opt_create_session, 0, 0, 0},
+	{"create-session",  'c',	POPT_ARG_STRING,	0, OPT_CREATE_SESSION, 0, 0},
 	{"create-trace",	'C',	POPT_ARG_VAL,		&opt_create_trace, 1, 0, 0},
-	{"destroy-session", 'd',	POPT_ARG_STRING,	&opt_destroy_session, 0, 0, 0},
-	{"group",			0,		POPT_ARG_STRING,	&opt_tracing_group, 0, 0},
+	{"destroy-session", 'd',	POPT_ARG_STRING,	0, OPT_DESTROY_SESSION, 0, 0},
+	{"group",			0,		POPT_ARG_STRING,	&opt_tracing_group, 0, 0, 0},
 	{"help",			'h',	POPT_ARG_NONE,		0, OPT_HELP, 0, 0},
 	{"kernel",			0,		POPT_ARG_VAL,		&opt_trace_kernel, 1, 0, 0},
 	{"list-apps",		'L',	POPT_ARG_VAL,		&opt_list_apps, 1, 0, 0},
@@ -129,6 +132,14 @@ int parse_args(int argc, const char **argv)
 			usage(stderr);
 			clean_exit(EXIT_SUCCESS);
 			break;
+		case OPT_CREATE_SESSION:
+			opt_create_session = 1;
+			opt_session_name = poptGetOptArg(pc);
+			break;
+		case OPT_DESTROY_SESSION:
+			opt_destroy_session = 1;
+			opt_session_uuid = poptGetOptArg(pc);
+			break;
 		default:
 			usage(stderr);
 			clean_exit(EXIT_FAILURE);