X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Foptions.c;h=eb31108c446ea5f07f55838245a360ef8861e220;hp=784e4fabc0c30170b8bf5a6cc18f5c07eea1d1df;hb=aaf975194bf54e911e7464b3723b2f247dbeb78b;hpb=826d496db7f18f2ae1f7e0d2f4fc381144ed04a4

diff --git a/lttng/options.c b/lttng/options.c
index 784e4fabc..eb31108c4 100644
--- a/lttng/options.c
+++ b/lttng/options.c
@@ -24,10 +24,14 @@
 /* Option variables */
 char *opt_tracing_group;
 char *opt_session_name;
+char *opt_create_session;
+char *opt_sessiond_path;
 int opt_trace_kernel = 0;
 int opt_quiet = 0;
 int opt_verbose = 0;
 int opt_list_apps = 0;
+int opt_no_sessiond = 0;
+int opt_list_session = 0;
 
 enum {
 	OPT_HELP = 42,
@@ -40,9 +44,13 @@ static struct poptOption long_options[] = {
 	{"kernel",			0,		POPT_ARG_VAL,		&opt_trace_kernel, 1, 0, 0},
 	{"no-kernel",		0,		POPT_ARG_VAL,		&opt_trace_kernel, 0, 0, 0},
 	{"session",			0,		POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_session_name, 0, 0},
+	{"create-session",  'c',	POPT_ARG_STRING,	&opt_create_session, 0, 0},
 	{"quiet",			'q',	POPT_ARG_VAL,		&opt_quiet, 1, 0},
 	{"verbose",			'v',	POPT_ARG_VAL,		&opt_verbose, 1, 0},
 	{"list-apps",		'l',	POPT_ARG_VAL,		&opt_list_apps, 1, 0},
+	{"no-sessiond",		0,		POPT_ARG_VAL,		&opt_no_sessiond, 1, 0},
+	{"sessiond-path",	0,		POPT_ARG_STRING,	&opt_sessiond_path, 0, 0},
+	{"list-session",	0,		POPT_ARG_VAL,		&opt_list_session, 1, 0},
 	{0, 0, 0, 0, 0, 0}
 };
 
@@ -56,17 +64,23 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "usage : lttng [OPTION]\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Options:\n");
-	fprintf(ofp, "  -v, --verbose           Verbose mode\n");
-	fprintf(ofp, "  -q, --quiet             Quiet mode\n");
-	fprintf(ofp, "      --help              Show help\n");
-	fprintf(ofp, "      --group NAME        Unix tracing group name. (default: tracing)\n");
+	fprintf(ofp, "  -v, --verbose                Verbose mode\n");
+	fprintf(ofp, "  -q, --quiet                  Quiet mode\n");
+	fprintf(ofp, "      --help                   Show help\n");
+	fprintf(ofp, "      --group NAME             Unix tracing group name. (default: tracing)\n");
+	fprintf(ofp, "      --no-sessiond            Don't spawn a session daemon.\n");
+	fprintf(ofp, "      --sessiond-path          Session daemon full path\n");
+	fprintf(ofp, "\n");
+	fprintf(ofp, "Session options:\n");
+	fprintf(ofp, "  -c, --create-session NAME    Create a new session\n");
+	fprintf(ofp, "      --list-session           List all available sessions\n");
+	//fprintf(ofp, "      --session [NAME]       Specify tracing session. If no NAME is given\n");
+	//fprintf(ofp, "                             or option is ommited, a session will be created\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Tracing options:\n");
-	//fprintf(ofp, "      --session [NAME]    Specify tracing session. If no NAME is given\n");
-	//fprintf(ofp, "                          or option is ommited, a session will be created\n");
-	//fprintf(ofp, "      --kernel            Enable kernel tracing\n");
-	//fprintf(ofp, "      --no-kernel         Disable kernel tracing\n");
-	fprintf(ofp, "  -l, --list-apps         List traceable UST applications\n");
+	//fprintf(ofp, "      --kernel               Enable kernel tracing\n");
+	//fprintf(ofp, "      --no-kernel            Disable kernel tracing\n");
+	fprintf(ofp, "  -l, --list-apps              List traceable UST applications\n");
 }
 
 /*