Add new API call lttng_channel_set_default_attr

[lttng-tools.git] / lttng / commands / calibrate.c

diff --git a/lttng/commands/calibrate.c b/lttng/commands/calibrate.c
index bcddc5e8bfefb9f674d6009c60809851260e980c..1219685e7515ab8ca5541c3c8f9222a53c6e602d 100644 (file)
--- a/lttng/commands/calibrate.c
+++ b/lttng/commands/calibrate.c
@@ -34,20 +34,20 @@
 
 static int opt_event_type;
 static char *opt_kernel;
-static char *opt_cmd_name;
 static int opt_pid_all;
 static int opt_userspace;
+static char *opt_cmd_name;
 static pid_t opt_pid;
 
 enum {
        OPT_HELP = 1,
-       OPT_USERSPACE,
        OPT_TRACEPOINT,
        OPT_MARKER,
        OPT_PROBE,
        OPT_FUNCTION,
        OPT_FUNCTION_ENTRY,
-       OPT_SYSCALLS,
+       OPT_SYSCALL,
+       OPT_USERSPACE,
 };
 
 static struct lttng_handle *handle;
@@ -56,7 +56,7 @@ static struct poptOption long_options[] = {
        /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
        {"help",           'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
        {"kernel",         'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
-       {"userspace",      'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, 0, OPT_USERSPACE, 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},
@@ -64,7 +64,7 @@ static struct poptOption long_options[] = {
        {"probe",          0,   POPT_ARG_NONE, 0, OPT_PROBE, 0, 0},
        {"function",       0,   POPT_ARG_NONE, 0, OPT_FUNCTION, 0, 0},
        {"function:entry", 0,   POPT_ARG_NONE, 0, OPT_FUNCTION_ENTRY, 0, 0},
-       {"syscalls",       0,   POPT_ARG_NONE, 0, OPT_SYSCALLS, 0, 0},
+       {"syscall",        0,   POPT_ARG_NONE, 0, OPT_SYSCALL, 0, 0},
        {0, 0, 0, 0, 0, 0, 0}
 };
 
@@ -89,7 +89,7 @@ static void usage(FILE *ofp)
        fprintf(ofp, "                           Dynamic function entry/return probe.\n");
        fprintf(ofp, "    --function:entry symbol\n");
        fprintf(ofp, "                           Function tracer event\n");
-       fprintf(ofp, "    --syscalls             System calls\n");
+       fprintf(ofp, "    --syscall              System call eventl\n");
        fprintf(ofp, "    --marker               User-space marker (deprecated)\n");
        fprintf(ofp, "\n");
 }
@@ -133,8 +133,8 @@ static int calibrate_lttng(void)
                case LTTNG_EVENT_FUNCTION_ENTRY:
                        DBG("Calibrating kernel function entry");
                        break;
-               case LTTNG_EVENT_SYSCALLS:
-                       DBG("Calibrating kernel syscalls");
+               case LTTNG_EVENT_SYSCALL:
+                       DBG("Calibrating kernel syscall");
                        break;
                default:
                        ret = CMD_NOT_IMPLEMENTED;
@@ -181,10 +181,6 @@ int cmd_calibrate(int argc, const char **argv)
                        usage(stderr);
                        ret = CMD_SUCCESS;
                        goto end;
-               case OPT_USERSPACE:
-                       opt_userspace = 1;
-                       opt_cmd_name = poptGetOptArg(pc);
-                       break;
                case OPT_TRACEPOINT:
                        ret = CMD_NOT_IMPLEMENTED;
                        break;
@@ -200,9 +196,12 @@ int cmd_calibrate(int argc, const char **argv)
                case OPT_FUNCTION_ENTRY:
                        ret = CMD_NOT_IMPLEMENTED;
                        break;
-               case OPT_SYSCALLS:
+               case OPT_SYSCALL:
                        ret = CMD_NOT_IMPLEMENTED;
                        break;
+               case OPT_USERSPACE:
+                       opt_userspace = 1;
+                       break;
                default:
                        usage(stderr);
                        ret = CMD_UNDEFINED;