Change lttng command line options for UST domain

lttng command line option --all is removed and replace by using -u alone
which indicates that the command must be applied to the UST global
domain.

$ lttng enable-event -u --all
is changed to
$ lttng enable-event -u

Also, the long option for -a, --all-events, is replaced by --all.

Signed-off-by: David Goulet <david.goulet@polymtl.ca>

diff --git a/lttng/commands/add_context.c b/lttng/commands/add_context.c
index 5986195b491383d942d279ef1c4714d4ed9e2d51..2d9699ce2c2b4bed3159d5d8b3af8426fecae96e 100644 (file)
--- a/lttng/commands/add_context.c
+++ b/lttng/commands/add_context.c
@@ -38,7 +38,6 @@ static char *opt_event_name;
 static char *opt_channel_name;
 static char *opt_session_name;
 static int opt_kernel;
-static int opt_pid_all;
 static int opt_userspace;
 static char *opt_cmd_name;
 static pid_t opt_pid;
@@ -142,7 +141,6 @@ static struct poptOption long_options[] = {
        {"event",          'e', POPT_ARG_STRING, &opt_event_name, 0, 0, 0},
        {"kernel",         'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
        {"userspace",      'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0},
-       {"all",            0,   POPT_ARG_VAL, &opt_pid_all, 1, 0, 0},
        {"pid",            'p', POPT_ARG_INT, &opt_pid, 0, 0, 0},
        {"type",           't', POPT_ARG_STRING, &opt_type, OPT_TYPE, 0, 0},
        {0, 0, 0, 0, 0, 0, 0}
@@ -308,8 +306,9 @@ static void usage(FILE *ofp)
        fprintf(ofp, "  -e, --event NAME         Apply on event\n");
        fprintf(ofp, "  -k, --kernel             Apply for the kernel tracer\n");
        fprintf(ofp, "  -u, --userspace [CMD]    Apply for the user-space tracer\n");
-       fprintf(ofp, "      --all                If -u, apply on all traceable apps\n");
-       fprintf(ofp, "  -p, --pid PID            If -u, apply on a specific PID\n");
+       fprintf(ofp, "                           If no CMD, the domain used is UST global\n");
+       fprintf(ofp, "                           or else the domain is UST EXEC_NAME\n");
+       fprintf(ofp, "  -p, --pid PID            If -u, apply to specific PID (domain: UST PID)\n");
        fprintf(ofp, "  -t, --type TYPE          Context type. You can repeat that option on\n");
        fprintf(ofp, "                           the command line.\n");
        fprintf(ofp, "                           TYPE can be one of the strings below:\n");
@@ -365,7 +364,7 @@ static int add_context(char *session_name)
                dom.type = LTTNG_DOMAIN_UST_EXEC_NAME;
                strncpy(dom.attr.exec_name, opt_cmd_name, NAME_MAX);
        } else {
-               ERR("Please specify a tracer (--kernel or --userspace)");
+               ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
                ret = CMD_NOT_IMPLEMENTED;
                goto error;
        }

diff --git a/lttng/commands/disable_channels.c b/lttng/commands/disable_channels.c
index 9ad5eb6c2f034140da9eec4ca0aea9cd4be63f39..434aae59a590d679ddd6db4138bb43368cd963c0 100644 (file)
--- a/lttng/commands/disable_channels.c
+++ b/lttng/commands/disable_channels.c
@@ -30,9 +30,8 @@
 #include "../utils.h"
 
 static char *opt_channels;
-static char *opt_kernel;
+static int opt_kernel;
 static char *opt_session_name;
-static int opt_pid_all;
 static int opt_userspace;
 static char *opt_cmd_name;
 static pid_t opt_pid;
@@ -50,7 +49,6 @@ static struct poptOption long_options[] = {
        {"session",        's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
        {"kernel",         'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
        {"userspace",      'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0},
-       {"all",            0,   POPT_ARG_VAL, &opt_pid_all, 1, 0, 0},
        {"pid",            'p', POPT_ARG_INT, &opt_pid, 0, 0, 0},
        {0, 0, 0, 0, 0, 0, 0}
 };
@@ -66,8 +64,9 @@ static void usage(FILE *ofp)
        fprintf(ofp, "  -s, --session            Apply on session name\n");
        fprintf(ofp, "  -k, --kernel             Apply for the kernel tracer\n");
        fprintf(ofp, "  -u, --userspace [CMD]    Apply for the user-space tracer\n");
-       fprintf(ofp, "      --all                If -u, apply on all traceable apps\n");
-       fprintf(ofp, "  -p, --pid PID            If -u, apply on a specific PID\n");
+       fprintf(ofp, "                           If no CMD, the domain used is UST global\n");
+       fprintf(ofp, "                           or else the domain is UST EXEC_NAME\n");
+       fprintf(ofp, "  -p, --pid PID            If -u, apply to specific PID (domain: UST PID)\n");
        fprintf(ofp, "\n");
 }
 
@@ -92,7 +91,7 @@ static int disable_channels(char *session_name)
                dom.type = LTTNG_DOMAIN_UST_EXEC_NAME;
                strncpy(dom.attr.exec_name, opt_cmd_name, NAME_MAX);
        } else {
-               ERR("Please specify a tracer (--kernel or --userspace)");
+               ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
                ret = CMD_NOT_IMPLEMENTED;
                goto error;
        }

diff --git a/lttng/commands/disable_events.c b/lttng/commands/disable_events.c
index 67af683c8817270ffa11b5307e2e4d358170c34f..5247110ef3ca67a0c514a6110b0762564f8f8eb3 100644 (file)
--- a/lttng/commands/disable_events.c
+++ b/lttng/commands/disable_events.c
@@ -33,7 +33,6 @@ static char *opt_event_list;
 static int opt_kernel;
 static char *opt_channel_name;
 static char *opt_session_name;
-static int opt_pid_all;
 static int opt_userspace;
 static char *opt_cmd_name;
 static int opt_disable_all;
@@ -54,7 +53,6 @@ static struct poptOption long_options[] = {
        {"channel",        'c', POPT_ARG_STRING, &opt_channel_name, 0, 0, 0},
        {"kernel",         'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
        {"userspace",      'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0},
-       {"all",            0,   POPT_ARG_VAL, &opt_pid_all, 1, 0, 0},
        {"pid",            'p', POPT_ARG_INT, &opt_pid, 0, 0, 0},
        {0, 0, 0, 0, 0, 0, 0}
 };
@@ -72,8 +70,9 @@ static void usage(FILE *ofp)
        fprintf(ofp, "  -a, --all-events         Disable all tracepoints\n");
        fprintf(ofp, "  -k, --kernel             Apply for the kernel tracer\n");
        fprintf(ofp, "  -u, --userspace [CMD]    Apply for the user-space tracer\n");
-       fprintf(ofp, "      --all                If -u, apply on all traceable apps\n");
-       fprintf(ofp, "  -p, --pid PID            If -u, apply on a specific PID\n");
+       fprintf(ofp, "                           If no CMD, the domain used is UST global\n");
+       fprintf(ofp, "                           or else the domain is UST EXEC_NAME\n");
+       fprintf(ofp, "  -p, --pid PID            If -u, apply to specific PID (domain: UST PID)\n");
        fprintf(ofp, "\n");
 }
 
@@ -98,6 +97,12 @@ static int disable_events(char *session_name)
                channel_name = opt_channel_name;
        }
 
+       if (opt_kernel && opt_userspace) {
+               ERR("Can't use -k/--kernel and -u/--userspace together");
+               ret = CMD_FATAL;
+               goto error;
+       }
+
        if (opt_kernel) {
                dom.type = LTTNG_DOMAIN_KERNEL;
        } else if (opt_pid != 0) {
@@ -112,7 +117,7 @@ static int disable_events(char *session_name)
                strncpy(dom.attr.exec_name, opt_cmd_name, NAME_MAX);
                dom.attr.exec_name[NAME_MAX - 1] = '\0';
        } else {
-               ERR("Please specify a tracer (--kernel or --userspace)");
+               ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
                ret = CMD_NOT_IMPLEMENTED;
                goto error;
        }
@@ -142,15 +147,15 @@ static int disable_events(char *session_name)
                        DBG("Disabling kernel event %s in channel %s",
                                        event_name, channel_name);
                } else if (opt_userspace) {             /* User-space tracer action */
-                       if (!opt_pid_all) {
-                               MSG("Only supporting tracing all UST processes (-u --all) for now.");
+                       if (opt_cmd_name != NULL || opt_pid) {
+                               MSG("Only supporting tracing all UST processes (-u) for now.");
                                ret = CMD_NOT_IMPLEMENTED;
                                goto error;
                        }
                        DBG("Disabling UST event %s in channel %s",
                                        event_name, channel_name);
                } else {
-                       ERR("Please specify a tracer (--kernel or --userspace)");
+                       ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
                        goto error;
                }
 

diff --git a/lttng/commands/enable_channels.c b/lttng/commands/enable_channels.c
index 5c9af1d9c8517b7c6e2998295e26516fb78b9590..ec4aae3cf44e168e8d6e8c7f1152c45e4caf472f 100644 (file)
--- a/lttng/commands/enable_channels.c
+++ b/lttng/commands/enable_channels.c
@@ -34,7 +34,6 @@ static char *opt_channels;
 static int opt_kernel;
 static char *opt_cmd_name;
 static char *opt_session_name;
-static int opt_pid_all;
 static int opt_userspace;
 static char *opt_cmd_name;
 static pid_t opt_pid;
@@ -59,7 +58,6 @@ static struct poptOption long_options[] = {
        {"session",        's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
        {"kernel",         'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
        {"userspace",      'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0},
-       {"all",            0,   POPT_ARG_VAL, &opt_pid_all, 1, 0, 0},
        {"pid",            'p', POPT_ARG_INT, &opt_pid, 0, 0, 0},
        {"discard",        0,   POPT_ARG_NONE, 0, OPT_DISCARD, 0, 0},
        {"overwrite",      0,   POPT_ARG_NONE, 0, OPT_OVERWRITE, 0, 0},
@@ -80,9 +78,10 @@ static void usage(FILE *ofp)
        fprintf(ofp, "  -h, --help               Show this help\n");
        fprintf(ofp, "  -s, --session            Apply on session name\n");
        fprintf(ofp, "  -k, --kernel             Apply on the kernel tracer\n");
-       fprintf(ofp, "  -u, --userspace [CMD]    Apply on the user-space tracer\n");
-       fprintf(ofp, "      --all                If -u, apply on all traceable apps\n");
-       fprintf(ofp, "  -p, --pid PID            If -u, apply on a specific PID\n");
+       fprintf(ofp, "  -u, --userspace [CMD]    Apply for the user-space tracer\n");
+       fprintf(ofp, "                           If no CMD, the domain used is UST global\n");
+       fprintf(ofp, "                           or else the domain is UST EXEC_NAME\n");
+       fprintf(ofp, "  -p, --pid PID            If -u, apply to specific PID (domain: UST PID)\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "Channel options:\n");
        fprintf(ofp, "      --discard            Discard event when buffers are full%s\n",
@@ -156,7 +155,7 @@ static int enable_channel(char *session_name)
                dom.type = LTTNG_DOMAIN_UST_EXEC_NAME;
                strncpy(dom.attr.exec_name, opt_cmd_name, NAME_MAX);
        } else {
-               ERR("Please specify a tracer (--kernel or --userspace)");
+               ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
                ret = CMD_NOT_IMPLEMENTED;
                goto error;
        }

diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c
index a043eb43f3bdebd5b23a6d209e10f1323195945e..e435e1f7858f0d15133a31d5ad8004fbd359925b 100644 (file)
--- a/lttng/commands/enable_events.c
+++ b/lttng/commands/enable_events.c
@@ -35,7 +35,6 @@ static char *opt_event_list;
 static int opt_event_type;
 static int opt_kernel;
 static char *opt_session_name;
-static int opt_pid_all;
 static int opt_userspace;
 static char *opt_cmd_name;
 static int opt_enable_all;
@@ -62,11 +61,10 @@ static struct poptOption long_options[] = {
        /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
        {"help",           'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
        {"session",        's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
-       {"all-events",     'a', POPT_ARG_VAL, &opt_enable_all, 1, 0, 0},
+       {"all",            'a', POPT_ARG_VAL, &opt_enable_all, 1, 0, 0},
        {"channel",        'c', POPT_ARG_STRING, &opt_channel_name, 0, 0, 0},
        {"kernel",         'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
        {"userspace",      'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0},
-       {"all",            0,   POPT_ARG_VAL, &opt_pid_all, 1, 0, 0},
        {"pid",            'p', POPT_ARG_INT, &opt_pid, 0, 0, 0},
        {"tracepoint",     0,   POPT_ARG_NONE, 0, OPT_TRACEPOINT, 0, 0},
        {"probe",          0,   POPT_ARG_STRING, &opt_probe, OPT_PROBE, 0, 0},
@@ -93,11 +91,12 @@ static void usage(FILE *ofp)
        fprintf(ofp, "  -h, --help               Show this help\n");
        fprintf(ofp, "  -s, --session            Apply on session name\n");
        fprintf(ofp, "  -c, --channel            Apply on this channel\n");
-       fprintf(ofp, "  -a, --all-events         Enable all tracepoints\n");
+       fprintf(ofp, "  -a, --all                Enable all tracepoints\n");
        fprintf(ofp, "  -k, --kernel             Apply for the kernel tracer\n");
        fprintf(ofp, "  -u, --userspace [CMD]    Apply for the user-space tracer\n");
-       fprintf(ofp, "      --all                If -u, apply on all traceable apps\n");
-       fprintf(ofp, "  -p, --pid PID            If -u, apply on a specific PID\n");
+       fprintf(ofp, "                           If no CMD, the domain used is UST global\n");
+       fprintf(ofp, "                           or else the domain is UST EXEC_NAME\n");
+       fprintf(ofp, "  -p, --pid PID            If -u, apply to specific PID (domain: UST PID)\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "Event options:\n");
        fprintf(ofp, "    --tracepoint           Tracepoint event (default)\n");
@@ -206,7 +205,7 @@ static int enable_events(char *session_name)
        }
 
        if (opt_kernel && opt_userspace) {
-               MSG("Choose only one of --kernel or --userspace");
+               ERR("Can't use -k/--kernel and -u/--userspace together");
                ret = CMD_FATAL;
                goto error;
        }
@@ -224,7 +223,7 @@ static int enable_events(char *session_name)
                dom.type = LTTNG_DOMAIN_UST_EXEC_NAME;
                strncpy(dom.attr.exec_name, opt_cmd_name, NAME_MAX);
        } else {
-               ERR("Please specify a tracer (--kernel or --userspace)");
+               ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
                ret = CMD_NOT_IMPLEMENTED;
                goto error;
        }
@@ -318,9 +317,8 @@ static int enable_events(char *session_name)
                                goto error;
                        }
                } else if (opt_userspace) {             /* User-space tracer action */
-                       if (!opt_pid_all) {
-                               MSG("Only supporting tracing all UST processes "
-                                               "(-u --all) for now.");
+                       if (opt_cmd_name != NULL || opt_pid) {
+                               MSG("Only supporting tracing all UST processes (-u) for now.");
                                ret = CMD_NOT_IMPLEMENTED;
                                goto error;
                        }
@@ -352,7 +350,7 @@ static int enable_events(char *session_name)
                                goto error;
                        }
                } else {
-                       ERR("Please specify a tracer (--kernel or --userspace)");
+                       ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
                        goto error;
                }