Don't spawen session daemon on version command

[lttng-tools.git] / src / bin / lttng / lttng.c

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 36d4c913df48ab681cbfac27e428c3f7888d339c..71bc1bf7706f57804833f9de90982ce0a4d0f7e0 100644 (file)
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -85,14 +85,14 @@ static void usage(FILE *ofp)
        fprintf(ofp, "usage: lttng [OPTIONS] <COMMAND>\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "Options:\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    Session daemon full path\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 and/or channel\n");
@@ -109,6 +109,8 @@ static void usage(FILE *ofp)
        fprintf(ofp, "    stop            Stop tracing\n");
        fprintf(ofp, "    version         Show version information\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 +178,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 +192,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;
        }
 
@@ -263,6 +265,9 @@ static int handle_command(int argc, char **argv)
                if (strcmp(argv[0], cmd->name) == 0) {
                        ret = cmd->func(argc, (const char**) argv);
                        switch (ret) {
+                       case CMD_WARNING:
+                               WARN("Some command(s) went wrong");
+                               break;
                        case CMD_ERROR:
                                ERR("Command error");
                                break;
@@ -362,7 +367,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;
@@ -384,7 +389,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;
                }
        }
@@ -406,7 +411,9 @@ 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"))) {
                        return 1;
                }
        }
@@ -415,10 +422,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)
 {
@@ -432,8 +438,8 @@ 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);
+                       goto end;
                case 'v':
                        opt_verbose += 1;
                        break;
@@ -452,11 +458,11 @@ 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);
                        goto error;
@@ -494,6 +500,7 @@ static int parse_args(int argc, char **argv)
                goto error;
        }
 
+end:
        return 0;
 
 error:
@@ -510,7 +517,7 @@ int main(int argc, char *argv[])
 
        progname = argv[0] ? argv[0] : "lttng";
 
-       /* For Mathieu Desnoyers aka Dr Tracing */
+       /* For Mathieu Desnoyers a.k.a. Dr. Tracing */
        if (strncmp(progname, "drtrace", 7) == 0 ||
                        strncmp("compudj", getenv("USER"), 7) == 0) {
                MSG("%c[%d;%dmWelcome back Dr Tracing!%c[%dm\n", 27,1,33,27,0);