X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=lttng%2Foptions.c;h=3025117e4c36b9f67bd8a168260d94304b34d226;hb=520ff6876d5fdf7e5421733a8f2a7d0c20e43c8c;hp=784e4fabc0c30170b8bf5a6cc18f5c07eea1d1df;hpb=826d496db7f18f2ae1f7e0d2f4fc381144ed04a4;p=lttng-tools.git

diff --git a/lttng/options.c b/lttng/options.c
index 784e4fabc..3025117e4 100644
--- a/lttng/options.c
+++ b/lttng/options.c
@@ -23,11 +23,20 @@
 
 /* Option variables */
 char *opt_tracing_group;
-char *opt_session_name;
+char *opt_session_uuid;
+char *opt_create_session;
+char *opt_sessiond_path;
+char *opt_destroy_session;
 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;
+int opt_list_traces = 0;
+pid_t opt_create_trace = 0;
+pid_t opt_start_trace = 0;
+pid_t opt_stop_trace = 0;
 
 enum {
 	OPT_HELP = 42,
@@ -35,15 +44,25 @@ enum {
 
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-	{"help",			'h',	POPT_ARG_NONE,		0, OPT_HELP, 0, 0},
+	{"create-session",  'c',	POPT_ARG_STRING,	&opt_create_session, 0, 0, 0},
+	{"create-trace",	'C',	POPT_ARG_INT,		&opt_create_trace, 0, 0, 0},
+	{"destroy-session", 'd',	POPT_ARG_STRING,	&opt_destroy_session, 0, 0, 0},
 	{"group",			0,		POPT_ARG_STRING,	&opt_tracing_group, 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},
+	{"list-sessions",	'l',	POPT_ARG_VAL,		&opt_list_session, 1, 0, 0},
+	{"list-traces",		't',	POPT_ARG_VAL,		&opt_list_traces, 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},
-	{"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},
-	{0, 0, 0, 0, 0, 0}
+	{"no-sessiond",		0,		POPT_ARG_VAL,		&opt_no_sessiond, 1, 0, 0},
+	{"quiet",			'q',	POPT_ARG_VAL,		&opt_quiet, 1, 0, 0},
+	{"session",			's',	POPT_ARG_STRING,	&opt_session_uuid, 0, 0, 0},
+	{"sessiond-path",	0,		POPT_ARG_STRING,	&opt_sessiond_path, 0, 0, 0},
+	{"start",			0,		POPT_ARG_INT,		&opt_start_trace, 0, 0, 0},
+	{"stop",			0,		POPT_ARG_INT,		&opt_stop_trace, 0, 0, 0},
+	{"verbose",			'v',	POPT_ARG_VAL,		&opt_verbose, 1, 0, 0},
+	//{"session",			0,		POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_session_name, 0, 0},
+	{0, 0, 0, 0, 0, 0, 0}
 };
 
 
@@ -56,17 +75,30 @@ 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, "  -l, --list-sessions          List all available sessions\n");
+	fprintf(ofp, "  -s, --session UUID           Specify tracing session using UUID\n");
+	fprintf(ofp, "  -d, --destroy-session=NAME   Destroy the session specified by NAME\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");
+	fprintf(ofp, "  -t, --list-traces            List session's traces. Use -s to specify the session\n");
+	fprintf(ofp, "  -C, --create-trace PID       Create trace for PID\n");
+	fprintf(ofp, "      --start PID              Start trace for PID\n");
+	fprintf(ofp, "      --stop PID               Stop trace for PID\n");
+	fprintf(ofp, "\n");
+	fprintf(ofp, "Please see the lttng(1) man page for full documentation.\n");
+	fprintf(ofp, "See http://lttng.org/ust for updates, bug reports and news.\n");
 }
 
 /*
@@ -80,7 +112,12 @@ int parse_args(int argc, const char **argv)
 	static poptContext pc;
 	int opt;
 
-	pc = poptGetContext("lttng", argc, argv, long_options, 0);
+	/* If no options, fail */
+	if (argc < 2) {
+		return -1;
+	}
+
+	pc = poptGetContext(NULL, argc, argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
 
 	while ((opt = poptGetNextOpt(pc)) != -1) {