X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcalibrate.c;h=092632cd78ffdea24da1261777d816d264e99c67;hp=2c1adb16c747d46ba2f7d2c27db1051ea94656b3;hb=b9dfb1671626365019a72318fb131eb321244245;hpb=af87c45a6179026e263c3a9eb251ccf8ec9537e7

diff --git a/src/bin/lttng/commands/calibrate.c b/src/bin/lttng/commands/calibrate.c
index 2c1adb16c..092632cd7 100644
--- a/src/bin/lttng/commands/calibrate.c
+++ b/src/bin/lttng/commands/calibrate.c
@@ -2,19 +2,18 @@
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  * Copyright (C) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -74,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}
 };
@@ -85,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");
@@ -110,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");
 }
@@ -127,14 +119,17 @@ static int calibrate_lttng(void)
 	struct lttng_domain dom;
 	struct lttng_calibrate calibrate;
 
+	memset(&dom, 0, sizeof(dom));
+	memset(&calibrate, 0, sizeof(calibrate));
+
 	/* Create lttng domain */
 	if (opt_kernel) {
 		dom.type = LTTNG_DOMAIN_KERNEL;
 	} else if (opt_userspace) {
 		dom.type = LTTNG_DOMAIN_UST;
 	} else {
-		ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
-		ret = CMD_UNDEFINED;
+		print_missing_domain();
+		ret = CMD_ERROR;
 		goto error;
 	}
 
@@ -156,7 +151,7 @@ static int calibrate_lttng(void)
 		calibrate.type = LTTNG_CALIBRATE_FUNCTION;
 		ret = lttng_calibrate(handle, &calibrate);
 		if (ret < 0) {
-			ret = CMD_ERROR;
+			ERR("%s", lttng_strerror(ret));
 			goto error;
 		}
 		MSG("%s calibration done", opt_kernel ? "Kernel" : "UST");
@@ -182,10 +177,12 @@ error:
 
 /*
  * Calibrate LTTng tracer.
+ *
+ * Returns a CMD_* error.
  */
 int cmd_calibrate(int argc, const char **argv)
 {
-	int opt, ret;
+	int opt, ret = CMD_SUCCESS;
 	static poptContext pc;
 
 	pc = poptGetContext(NULL, argc, argv, long_options, 0);
@@ -198,7 +195,6 @@ int cmd_calibrate(int argc, const char **argv)
 		switch (opt) {
 		case OPT_HELP:
 			usage(stdout);
-			ret = CMD_SUCCESS;
 			goto end;
 		case OPT_TRACEPOINT:
 			ret = CMD_UNDEFINED;
@@ -223,7 +219,6 @@ int cmd_calibrate(int argc, const char **argv)
 			break;
 		case OPT_LIST_OPTIONS:
 			list_cmd_options(stdout, long_options);
-			ret = CMD_SUCCESS;
 			goto end;
 		default:
 			usage(stderr);
@@ -235,5 +230,6 @@ int cmd_calibrate(int argc, const char **argv)
 	ret = calibrate_lttng();
 
 end:
+	poptFreeContext(pc);
 	return ret;
 }