X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng%2Fcommands%2Fcalibrate.c;h=7d4de2909cf0f3fc45c1234c52b1f09e7fb2ec3f;hb=c7e35b037773dbbfe10178c946ba44feefb226e1;hp=a14570eea5e3341b173595ff91c07323e66d2cbb;hpb=d14d33bf091e72b23b1f90ea18a0a01bed098b76;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/calibrate.c b/src/bin/lttng/commands/calibrate.c
index a14570eea..7d4de2909 100644
--- a/src/bin/lttng/commands/calibrate.c
+++ b/src/bin/lttng/commands/calibrate.c
@@ -73,8 +73,8 @@ static struct poptOption long_options[] = {
 	 * tracer anymore.
 	 */
 	{"function:entry", 0,   POPT_ARG_NONE, 0, OPT_FUNCTION_ENTRY, 0, 0},
-#endif
 	{"syscall",        0,   POPT_ARG_NONE, 0, OPT_SYSCALL, 0, 0},
+#endif
 	{"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
 	{0, 0, 0, 0, 0, 0, 0}
 };
@@ -84,21 +84,16 @@ static struct poptOption long_options[] = {
  */
 static void usage(FILE *ofp)
 {
-	fprintf(ofp, "usage: lttng calibrate [options] [calibrate_options]\n");
+	fprintf(ofp, "usage: lttng calibrate [-k|-u] [OPTIONS]\n");
 	fprintf(ofp, "\n");
+	fprintf(ofp, "Options:\n");
 	fprintf(ofp, "  -h, --help               Show this help\n");
 	fprintf(ofp, "      --list-options       Simple listing of options\n");
 	fprintf(ofp, "  -k, --kernel             Apply to the kernel tracer\n");
-#if 0
-	fprintf(ofp, "  -u, --userspace [CMD]    Apply to the user-space tracer (domain: UST\n");
-	fprintf(ofp, "                           EXEC_NAME). If no CMD, the domain is UST global.\n";
-	fprintf(ofp, "                           (-k preempts -u)\n");
-	fprintf(ofp, "  -p, --pid PID            If -u, apply to specific PID (domain: UST PID)\n");
-#else
 	fprintf(ofp, "  -u, --userspace          Apply to the user-space tracer\n");
-#endif
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Calibrate options:\n");
+	fprintf(ofp, "    --function             Dynamic function entry/return probe (default)\n");
 #if 0
 	fprintf(ofp, "    --tracepoint           Tracepoint event (default)\n");
 	fprintf(ofp, "    --probe\n");
@@ -109,8 +104,6 @@ static void usage(FILE *ofp)
 #endif
 	fprintf(ofp, "    --syscall              System call eventl\n");
 	fprintf(ofp, "    --marker               User-space marker (deprecated)\n");
-#else
-	fprintf(ofp, "    --function             Dynamic function entry/return probe (default)\n");
 #endif
 	fprintf(ofp, "\n");
 }
@@ -135,11 +128,18 @@ static int calibrate_lttng(void)
 	} else if (opt_userspace) {
 		dom.type = LTTNG_DOMAIN_UST;
 	} else {
-		ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
+		print_missing_domain();
 		ret = CMD_ERROR;
 		goto error;
 	}
 
+	/* TODO: mi support */
+	if (lttng_opt_mi) {
+		ret = -LTTNG_ERR_MI_NOT_IMPLEMENTED;
+		ERR("mi option not supported");
+		goto error;
+	}
+
 	handle = lttng_create_handle(NULL, &dom);
 	if (handle == NULL) {
 		ret = CMD_ERROR;
@@ -158,6 +158,7 @@ static int calibrate_lttng(void)
 		calibrate.type = LTTNG_CALIBRATE_FUNCTION;
 		ret = lttng_calibrate(handle, &calibrate);
 		if (ret < 0) {
+			ERR("%s", lttng_strerror(ret));
 			goto error;
 		}
 		MSG("%s calibration done", opt_kernel ? "Kernel" : "UST");