X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Flttng.c;h=e6ca9cfd9877485339188fbbbf1626f0a8d21ae7;hp=aeaad1469725db898871c6a644f1b2a00119d8a7;hb=76f66f6356f4ad6bebc7b69b3856d2529c102106;hpb=5a532b6873b6d619381c0188b91e48106e639808 diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c index aeaad1469..e6ca9cfd9 100644 --- a/src/bin/lttng/lttng.c +++ b/src/bin/lttng/lttng.c @@ -2,9 +2,8 @@ * Copyright (c) 2011 David Goulet * * 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 - * as published by the Free Software Foundation; only version 2 - * of the License. + * 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 @@ -26,6 +25,7 @@ #include #include #include +#include #include #include @@ -34,9 +34,6 @@ /* Variables */ static char *progname; - -int opt_quiet; -int opt_verbose; static int opt_no_sessiond; static char *opt_sessiond_path; static pid_t sessiond_pid; @@ -76,38 +73,46 @@ static struct cmd_struct commands[] = { { "set-session", cmd_set_session}, { "version", cmd_version}, { "calibrate", cmd_calibrate}, + { "view", cmd_view}, + { "enable-consumer", cmd_enable_consumer}, + { "disable-consumer", cmd_disable_consumer}, { NULL, NULL} /* Array closure */ }; static void usage(FILE *ofp) { - fprintf(ofp, "LTTng Trace Control " VERSION"\n\n"); - fprintf(ofp, "usage: lttng [options] \n"); + fprintf(ofp, "LTTng Trace Control " VERSION" - " VERSION_NAME"\n\n"); + fprintf(ofp, "usage: lttng [OPTIONS] []\n"); fprintf(ofp, "\n"); fprintf(ofp, "Options:\n"); - fprintf(ofp, " -h, --help Show this help\n"); - fprintf(ofp, " -g, --group NAME Unix tracing group name. (default: tracing)\n"); - fprintf(ofp, " -v, --verbose Verbose mode\n"); - fprintf(ofp, " -q, --quiet Quiet mode\n"); - fprintf(ofp, " -n, --no-sessiond Don't spawn a session daemon\n"); - fprintf(ofp, " --sessiond-path Session daemon full path\n"); - fprintf(ofp, " --list-options Simple listing of lttng options\n"); - fprintf(ofp, " --list-commands Simple listing of lttng commands\n"); + fprintf(ofp, " -h, --help Show this help\n"); + fprintf(ofp, " --list-options Simple listing of lttng options\n"); + fprintf(ofp, " --list-commands Simple listing of lttng commands\n"); + fprintf(ofp, " -v, --verbose Increase verbosity\n"); + fprintf(ofp, " -q, --quiet Quiet mode\n"); + fprintf(ofp, " -g, --group NAME Unix tracing group name. (default: tracing)\n"); + fprintf(ofp, " -n, --no-sessiond Don't spawn a session daemon\n"); + fprintf(ofp, " --sessiond-path PATH Session daemon full path\n"); fprintf(ofp, "\n"); fprintf(ofp, "Commands:\n"); - fprintf(ofp, " add-context Add context to event or/and channel\n"); - fprintf(ofp, " calibrate Quantify LTTng overhead\n"); - fprintf(ofp, " create Create tracing session\n"); - fprintf(ofp, " destroy Teardown tracing session\n"); - fprintf(ofp, " enable-channel Enable tracing channel\n"); - fprintf(ofp, " enable-event Enable tracing event\n"); - fprintf(ofp, " disable-channel Disable tracing channel\n"); - fprintf(ofp, " disable-event Disable tracing event\n"); - fprintf(ofp, " list List possible tracing options\n"); - fprintf(ofp, " set-session Set current session name\n"); - fprintf(ofp, " start Start tracing\n"); - fprintf(ofp, " stop Stop tracing\n"); - fprintf(ofp, " version Show version information\n"); + fprintf(ofp, " add-context Add context to event and/or channel\n"); + fprintf(ofp, " calibrate Quantify LTTng overhead\n"); + fprintf(ofp, " create Create tracing session\n"); + fprintf(ofp, " destroy Tear down tracing session\n"); + fprintf(ofp, " enable-channel Enable tracing channel\n"); + fprintf(ofp, " enable-event Enable tracing event\n"); + fprintf(ofp, " disable-channel Disable tracing channel\n"); + fprintf(ofp, " disable-event Disable tracing event\n"); + fprintf(ofp, " enable-consumer Enable local or streaming consumer\n"); + fprintf(ofp, " disable-consumer Disable consumer\n"); + fprintf(ofp, " list List possible tracing options\n"); + fprintf(ofp, " set-session Set current session name\n"); + fprintf(ofp, " start Start tracing\n"); + fprintf(ofp, " stop Stop tracing\n"); + fprintf(ofp, " version Show version information\n"); + fprintf(ofp, " view Start trace viewer\n"); + fprintf(ofp, "\n"); + fprintf(ofp, "Each command also has its own -h, --help option.\n"); fprintf(ofp, "\n"); fprintf(ofp, "Please see the lttng(1) man page for full documentation.\n"); fprintf(ofp, "See http://lttng.org for updates, bug reports and news.\n"); @@ -176,11 +181,11 @@ static void sighandler(int sig) switch (sig) { case SIGTERM: - DBG("SIGTERM caugth"); + DBG("SIGTERM caught"); clean_exit(EXIT_FAILURE); break; case SIGCHLD: - DBG("SIGCHLD caugth"); + DBG("SIGCHLD caught"); waitpid(sessiond_pid, &status, 0); recv_child_signal = 1; /* Indicate that the session daemon died */ @@ -190,10 +195,10 @@ static void sighandler(int sig) case SIGUSR1: /* Notify is done */ recv_child_signal = 1; - DBG("SIGUSR1 caugth"); + DBG("SIGUSR1 caught"); break; default: - DBG("Unknown signal %d caugth", sig); + DBG("Unknown signal %d caught", sig); break; } @@ -262,17 +267,6 @@ static int handle_command(int argc, char **argv) /* Find command */ if (strcmp(argv[0], cmd->name) == 0) { ret = cmd->func(argc, (const char**) argv); - switch (ret) { - case CMD_ERROR: - ERR("Command error"); - break; - case CMD_UNDEFINED: - ERR("Undefined command"); - break; - case CMD_FATAL: - ERR("Fatal error"); - break; - } goto end; } i++; @@ -316,19 +310,20 @@ static int spawn_sessiond(char *pathname) } else if (pid > 0) { sessiond_pid = pid; /* - * Wait for lttng-sessiond to start. We need to use a - * flag to check if the signal has been sent to us, - * because the child can be scheduled before the parent, - * and thus send the signal before this check. In the - * signal handler, we set the recv_child_signal flag, so - * anytime we check it after the fork is fine. Note that - * sleep() is interrupted before the 1 second delay as - * soon as the signal is received, so it will not cause - * visible delay for the user. + * Wait for lttng-sessiond to start. We need to use a flag to check if + * the signal has been sent to us, because the child can be scheduled + * before the parent, and thus send the signal before this check. In + * the signal handler, we set the recv_child_signal flag, so anytime we + * check it after the fork is fine. Note that sleep() is interrupted + * before the 1 second delay as soon as the signal is received, so it + * will not cause visible delay for the user. */ while (!recv_child_signal) { sleep(1); } + /* + * The signal handler will nullify sessiond_pid on SIGCHLD + */ if (!sessiond_pid) { exit(EXIT_FAILURE); } @@ -361,7 +356,7 @@ static int check_sessiond(void) if (opt_sessiond_path != NULL) { ret = access(opt_sessiond_path, F_OK | X_OK); if (ret < 0) { - ERR("No such file: %s", opt_sessiond_path); + ERR("No such file or access denied: %s", opt_sessiond_path); goto end; } pathname = opt_sessiond_path; @@ -383,7 +378,7 @@ static int check_sessiond(void) ret = spawn_sessiond(pathname); free(alloc_pathname); if (ret < 0) { - ERR("Problem occurs when starting %s", pathname); + ERR("Problem occurred when starting %s", pathname); goto end; } } @@ -405,7 +400,10 @@ static int check_args_no_sessiond(int argc, char **argv) for (i = 0; i < argc; i++) { if ((strncmp(argv[i], "-h", sizeof("-h")) == 0) || strncmp(argv[i], "--h", sizeof("--h")) == 0 || - strncmp(argv[i], "--list-options", sizeof("--list-options")) == 0) { + strncmp(argv[i], "--list-options", sizeof("--list-options")) == 0 || + strncmp(argv[i], "--list-commands", sizeof("--list-commands")) == 0 || + strncmp(argv[i], "version", sizeof("version")) == 0 || + strncmp(argv[i], "view", sizeof("view")) == 0) { return 1; } } @@ -414,10 +412,9 @@ static int check_args_no_sessiond(int argc, char **argv) } /* - * parse_args + * Parse command line arguments. * - * Parse command line arguments. - * Return 0 if OK, else -1 + * Return 0 if OK, else -1 */ static int parse_args(int argc, char **argv) { @@ -431,13 +428,14 @@ static int parse_args(int argc, char **argv) while ((opt = getopt_long(argc, argv, "+hnvqg:", long_options, NULL)) != -1) { switch (opt) { case 'h': - usage(stderr); - goto error; + usage(stdout); + ret = 0; + goto end; case 'v': - opt_verbose += 1; + lttng_opt_verbose += 1; break; case 'q': - opt_quiet = 1; + lttng_opt_quiet = 1; break; case 'g': lttng_set_tracing_group(optarg); @@ -451,31 +449,34 @@ static int parse_args(int argc, char **argv) case OPT_DUMP_OPTIONS: list_options(stdout); ret = 0; - goto error; + goto end; case OPT_DUMP_COMMANDS: list_commands(stdout); ret = 0; - goto error; + goto end; default: usage(stderr); + ret = 1; goto error; } } /* If both options are specified, quiet wins */ - if (opt_verbose && opt_quiet) { - opt_verbose = 0; + if (lttng_opt_verbose && lttng_opt_quiet) { + lttng_opt_verbose = 0; } /* Spawn session daemon if needed */ if (opt_no_sessiond == 0 && check_args_no_sessiond(argc, argv) == 0 && (check_sessiond() < 0)) { + ret = 1; goto error; } /* No leftovers, print usage and quit */ if ((argc - optind) == 0) { usage(stderr); + ret = 1; goto error; } @@ -484,19 +485,35 @@ static int parse_args(int argc, char **argv) * options. */ ret = handle_command(argc - optind, argv + optind); - if (ret < 0) { - if (ret == -1) { - usage(stderr); - } else { - ERR("%s", lttng_strerror(ret)); + switch (ret) { + case CMD_WARNING: + WARN("Some command(s) went wrong"); + break; + case CMD_ERROR: + ERR("Command error"); + break; + case CMD_UNDEFINED: + ERR("Undefined command"); + break; + case CMD_FATAL: + ERR("Fatal error"); + break; + case -1: + usage(stderr); + ret = 1; + break; + case 0: + break; + default: + if (ret < 0) { + ret = -ret; } - goto error; + break; } - return 0; - +end: error: - return -1; + return ret; } @@ -506,14 +523,17 @@ error: int main(int argc, char *argv[]) { int ret; + char *user; progname = argv[0] ? argv[0] : "lttng"; - /* For Mathieu Desnoyers aka Dr Tracing */ - if (strncmp(progname, "drtrace", 7) == 0 || - strncmp("compudj", getenv("USER"), 7) == 0) { + /* For Mathieu Desnoyers a.k.a. Dr. Tracing */ + user = getenv("USER"); + if (user != NULL && ((strncmp(progname, "drtrace", 7) == 0 || + strncmp("compudj", user, 7) == 0))) { MSG("%c[%d;%dmWelcome back Dr Tracing!%c[%dm\n", 27,1,33,27,0); } + /* Thanks Mathieu */ ret = set_signal_handler(); if (ret < 0) { @@ -521,8 +541,8 @@ int main(int argc, char *argv[]) } ret = parse_args(argc, argv); - if (ret < 0) { - clean_exit(EXIT_FAILURE); + if (ret != 0) { + clean_exit(ret); } return 0;