X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fcalibrate.c;h=3fa87e3ecf47f52fbab0d938525aa37bd68d129e;hp=bcddc5e8bfefb9f674d6009c60809851260e980c;hb=734f79bf717d87817623d382c59086dc9e8ef610;hpb=0133c1990185d0374ec06a751da23b7a84c54d78

diff --git a/lttng/commands/calibrate.c b/lttng/commands/calibrate.c
index bcddc5e8b..3fa87e3ec 100644
--- 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,15 +56,21 @@ 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},
 	{"marker",         0,   POPT_ARG_NONE, 0, OPT_MARKER, 0, 0},
 	{"probe",          0,   POPT_ARG_NONE, 0, OPT_PROBE, 0, 0},
 	{"function",       0,   POPT_ARG_NONE, 0, OPT_FUNCTION, 0, 0},
+#if 0
+	/*
+	 * Removed from options to discourage its use. Not in kernel
+	 * tracer anymore.
+	 */
 	{"function:entry", 0,   POPT_ARG_NONE, 0, OPT_FUNCTION_ENTRY, 0, 0},
-	{"syscalls",       0,   POPT_ARG_NONE, 0, OPT_SYSCALLS, 0, 0},
+#endif
+	{"syscall",        0,   POPT_ARG_NONE, 0, OPT_SYSCALL, 0, 0},
 	{0, 0, 0, 0, 0, 0, 0}
 };
 
@@ -87,9 +93,11 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "                           Dynamic probe.\n");
 	fprintf(ofp, "    --function\n");
 	fprintf(ofp, "                           Dynamic function entry/return probe.\n");
+#if 0
 	fprintf(ofp, "    --function:entry symbol\n");
 	fprintf(ofp, "                           Function tracer event\n");
-	fprintf(ofp, "    --syscalls             System calls\n");
+#endif
+	fprintf(ofp, "    --syscall              System call eventl\n");
 	fprintf(ofp, "    --marker               User-space marker (deprecated)\n");
 	fprintf(ofp, "\n");
 }
@@ -133,8 +141,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 +189,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 +204,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;