X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcalibrate.c;h=7d4de2909cf0f3fc45c1234c52b1f09e7fb2ec3f;hp=81eadbfd2b6d54499fd7d657e49a051361ac0c8b;hb=c7e35b037773dbbfe10178c946ba44feefb226e1;hpb=679b4943c3b0f451e7f4fbcd804dd8a7a679e253 diff --git a/src/bin/lttng/commands/calibrate.c b/src/bin/lttng/commands/calibrate.c index 81eadbfd2..7d4de2909 100644 --- a/src/bin/lttng/commands/calibrate.c +++ b/src/bin/lttng/commands/calibrate.c @@ -2,19 +2,18 @@ * Copyright (C) 2011 - David Goulet * Copyright (C) 2011 - Mathieu Desnoyers * - * 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 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, " -k, --kernel Apply to the kernel tracer\n"); + fprintf(ofp, " -u, --userspace Apply to the user-space tracer\n"); 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,16 +104,14 @@ 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"); } /* - * calibrate_lttng + * Calibrate LTTng. * - * Calibrate LTTng. + * Returns a CMD_* error. */ static int calibrate_lttng(void) { @@ -127,20 +119,30 @@ 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; + } + + /* 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 = -1; + ret = CMD_ERROR; goto error; } @@ -156,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"); @@ -171,6 +174,8 @@ static int calibrate_lttng(void) goto error; } + ret = CMD_SUCCESS; + error: lttng_destroy_handle(handle); @@ -178,13 +183,13 @@ error: } /* - * cmd_calibrate + * Calibrate LTTng tracer. * - * 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); @@ -196,8 +201,7 @@ int cmd_calibrate(int argc, const char **argv) while ((opt = poptGetNextOpt(pc)) != -1) { switch (opt) { case OPT_HELP: - usage(stderr); - ret = CMD_SUCCESS; + usage(stdout); goto end; case OPT_TRACEPOINT: ret = CMD_UNDEFINED; @@ -222,7 +226,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); @@ -234,5 +237,6 @@ int cmd_calibrate(int argc, const char **argv) ret = calibrate_lttng(); end: + poptFreeContext(pc); return ret; }