Change not implemented error to undefined.

[lttng-tools.git] / src / bin / lttng / commands / enable_events.c

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 3c1c3916e0344a48098fe92e4c771201c356f7a0..c5a969f208e5fa66d11494a7aa49d41f4052fa5e 100644 (file)
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -27,22 +27,23 @@
 #include <inttypes.h>
 #include <ctype.h>
 
-#include "../cmd.h"
-#include "../conf.h"
-#include "../utils.h"
+#include "../command.h"
 
 static char *opt_event_list;
 static int opt_event_type;
 static int opt_kernel;
 static char *opt_session_name;
 static int opt_userspace;
-static char *opt_cmd_name;
 static int opt_enable_all;
-static pid_t opt_pid;
 static char *opt_probe;
 static char *opt_function;
 static char *opt_function_entry_symbol;
 static char *opt_channel_name;
+#if 0
+/* Not implemented yet */
+static char *opt_cmd_name;
+static pid_t opt_pid;
+#endif
 
 enum {
        OPT_HELP = 1,
@@ -64,8 +65,13 @@ static struct poptOption long_options[] = {
        {"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},
+#if 0
+       /* Not implemented yet */
        {"userspace",      'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0},
        {"pid",            'p', POPT_ARG_INT, &opt_pid, 0, 0, 0},
+#else
+       {"userspace",      'u', POPT_ARG_NONE, 0, OPT_USERSPACE, 0, 0},
+#endif
        {"tracepoint",     0,   POPT_ARG_NONE, 0, OPT_TRACEPOINT, 0, 0},
        {"probe",          0,   POPT_ARG_STRING, &opt_probe, OPT_PROBE, 0, 0},
        {"function",       0,   POPT_ARG_STRING, &opt_function, OPT_FUNCTION, 0, 0},
@@ -93,10 +99,14 @@ static void usage(FILE *ofp)
        fprintf(ofp, "  -c, --channel            Apply on this channel\n");
        fprintf(ofp, "  -a, --all                Enable all tracepoints\n");
        fprintf(ofp, "  -k, --kernel             Apply for the kernel tracer\n");
+#if 0
        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");
+#else
+       fprintf(ofp, "  -u, --userspace          Apply for the user-space tracer\n");
+#endif
        fprintf(ofp, "\n");
        fprintf(ofp, "Event options:\n");
        fprintf(ofp, "    --tracepoint           Tracepoint event (default)\n");
@@ -218,18 +228,11 @@ static int enable_events(char *session_name)
        /* Create lttng domain */
        if (opt_kernel) {
                dom.type = LTTNG_DOMAIN_KERNEL;
-       } else if (opt_pid != 0) {
-               dom.type = LTTNG_DOMAIN_UST_PID;
-               dom.attr.pid = opt_pid;
-               DBG("PID %d set to lttng handle", opt_pid);
-       } else if (opt_userspace && opt_cmd_name == NULL) {
+       } else if (opt_userspace) {
                dom.type = LTTNG_DOMAIN_UST;
-       } else if (opt_userspace && opt_cmd_name != NULL) {
-               dom.type = LTTNG_DOMAIN_UST_EXEC_NAME;
-               strncpy(dom.attr.exec_name, opt_cmd_name, NAME_MAX);
        } else {
                ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
-               ret = CMD_NOT_IMPLEMENTED;
+               ret = CMD_UNDEFINED;
                goto error;
        }
 
@@ -324,15 +327,17 @@ static int enable_events(char *session_name)
                                MSG("per-syscall selection not supported yet. Use \"-a\" "
                                                "for all syscalls.");
                        default:
-                               ret = CMD_NOT_IMPLEMENTED;
+                               ret = CMD_UNDEFINED;
                                goto error;
                        }
                } else if (opt_userspace) {             /* User-space tracer action */
+#if 0
                        if (opt_cmd_name != NULL || opt_pid) {
                                MSG("Only supporting tracing all UST processes (-u) for now.");
-                               ret = CMD_NOT_IMPLEMENTED;
+                               ret = CMD_UNDEFINED;
                                goto error;
                        }
+#endif
 
                        DBG("Enabling UST event %s for channel %s", event_name,
                                        channel_name);
@@ -357,7 +362,7 @@ static int enable_events(char *session_name)
                        case LTTNG_EVENT_FUNCTION_ENTRY:
                        case LTTNG_EVENT_SYSCALL:
                        default:
-                               ret = CMD_NOT_IMPLEMENTED;
+                               ret = CMD_UNDEFINED;
                                goto error;
                        }
                } else {