X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fview.c;h=faca60de8b980adfe60afcb2ac68a7c202a65595;hb=d68c9a04537b683991a7355b812b0af954008cf1;hp=dcd4d66245fb5049fa241c00feb771fdf52d93ba;hpb=c7e35b037773dbbfe10178c946ba44feefb226e1;p=lttng-tools.git diff --git a/src/bin/lttng/commands/view.c b/src/bin/lttng/commands/view.c index dcd4d6624..faca60de8 100644 --- a/src/bin/lttng/commands/view.c +++ b/src/bin/lttng/commands/view.c @@ -15,7 +15,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE +#define _LGPL_SOURCE #include #include #include @@ -25,7 +25,6 @@ #include #include "../command.h" -#include static char *opt_session_name; static char *opt_viewer; @@ -33,6 +32,12 @@ static char *opt_trace_path; static const char *babeltrace_bin = CONFIG_BABELTRACE_BIN; //static const char *lttv_gui_bin = CONFIG_LTTV_GUI_BIN; +#ifdef LTTNG_EMBED_HELP +static const char help_msg[] = +#include +; +#endif + enum { OPT_HELP = 1, OPT_LIST_OPTIONS, @@ -79,30 +84,6 @@ static struct viewers { /* Is the session we are trying to view is in live mode. */ static int session_live_mode; -/* - * usage - */ -static void usage(FILE *ofp) -{ - fprintf(ofp, "usage: lttng view [SESSION_NAME] [OPTIONS]\n"); - fprintf(ofp, "\n"); - fprintf(ofp, "By default, the babeltrace viewer will be used for text viewing\n"); - fprintf(ofp, "\n"); - fprintf(ofp, "Where SESSION_NAME is an optional session name. If not specified, lttng will\n"); - fprintf(ofp, "get it from the configuration file (.lttngrc).\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, " -t, --trace-path PATH Trace directory path for the viewer\n"); - fprintf(ofp, " -e, --viewer CMD Specify viewer and/or options to use\n"); - fprintf(ofp, " This will completely override the default viewers so\n"); - fprintf(ofp, " please make sure to specify the full command. The trace\n"); - fprintf(ofp, " directory path of the session will be appended at the end\n"); - fprintf(ofp, " to the arguments\n"); - fprintf(ofp, "\n"); -} - static struct viewers *parse_options(void) { if (opt_viewer == NULL) { @@ -110,12 +91,6 @@ static struct viewers *parse_options(void) return &(viewers[VIEWER_BABELTRACE]); } -#if 0 - if (strstr(opt_viewer, viewers[VIEWER_LTTV_GUI].exec_name) == 0) { - return &(viewers[VIEWER_LTTV_GUI]); - } -#endif - /* * This means that if -e, --viewers is used, we just override everything * with it. For supported viewers like lttv, we could simply detect if "-t" @@ -151,7 +126,7 @@ static char **alloc_argv_from_user_opts(char *opts, const char *trace_path) } while (*token != '\0'); /* Add two here for the NULL terminating element and trace path */ - argv = malloc(sizeof(char *) * (num_opts + 2)); + argv = zmalloc(sizeof(char *) * (num_opts + 2)); if (argv == NULL) { goto error; } @@ -159,6 +134,9 @@ static char **alloc_argv_from_user_opts(char *opts, const char *trace_path) token = strtok(opts, " "); while (token != NULL) { argv[i] = strdup(token); + if (argv[i] == NULL) { + goto error; + } token = strtok(NULL, " "); i++; } @@ -169,6 +147,13 @@ static char **alloc_argv_from_user_opts(char *opts, const char *trace_path) return argv; error: + if (argv) { + for (i = 0; i < num_opts + 2; i++) { + free(argv[i]); + } + free(argv); + } + return NULL; } @@ -198,7 +183,7 @@ static char **alloc_argv_from_local_opts(const char **opts, size_t opts_len, size = sizeof(char *) * mem_len; /* Add two here for the trace_path and the NULL terminating element. */ - argv = malloc(size); + argv = zmalloc(size); if (argv == NULL) { goto error; } @@ -247,17 +232,6 @@ static int spawn_viewer(const char *trace_path) argv = alloc_argv_from_local_opts(babeltrace_opts, ARRAY_SIZE(babeltrace_opts), trace_path); break; -#if 0 - case VIEWER_LTTV_GUI: - if (stat(lttv_gui_bin, &status) == 0) { - viewer_bin = lttv_gui_bin; - } else { - viewer_bin = viewer->exec_name; - } - argv = alloc_argv_from_local_opts(lttv_gui_opts, - ARRAY_SIZE(lttv_gui_opts), trace_path); - break; -#endif case VIEWER_USER_DEFINED: argv = alloc_argv_from_user_opts(opt_viewer, trace_path); if (argv) { @@ -271,7 +245,7 @@ static int spawn_viewer(const char *trace_path) break; } - if (argv == NULL) { + if (argv == NULL || !viewer_bin) { ret = CMD_FATAL; goto error; } @@ -285,12 +259,12 @@ static int spawn_viewer(const char *trace_path) } else { PERROR("exec: %s", viewer_bin); } - free(argv); ret = CMD_FATAL; goto error; } error: + free(argv); return ret; } @@ -305,14 +279,14 @@ static char *build_live_path(char *session_name) ret = gethostname(hostname, sizeof(hostname)); if (ret < 0) { - perror("gethostname"); + PERROR("gethostname"); goto error; } ret = asprintf(&path, "net://localhost/host/%s/%s", hostname, session_name); if (ret < 0) { - perror("asprintf live path"); + PERROR("asprintf live path"); goto error; } @@ -441,6 +415,7 @@ int cmd_view(int argc, const char **argv) { int opt, ret = CMD_SUCCESS; static poptContext pc; + const char *leftover = NULL; pc = poptGetContext(NULL, argc, argv, long_options, 0); poptReadDefaultConfig(pc, 0); @@ -452,13 +427,12 @@ int cmd_view(int argc, const char **argv) while ((opt = poptGetNextOpt(pc)) != -1) { switch (opt) { case OPT_HELP: - usage(stdout); + SHOW_HELP(); goto end; case OPT_LIST_OPTIONS: list_cmd_options(stdout, long_options); goto end; default: - usage(stderr); ret = CMD_UNDEFINED; goto end; } @@ -466,6 +440,13 @@ int cmd_view(int argc, const char **argv) opt_session_name = (char*) poptGetArg(pc); + leftover = poptGetArg(pc); + if (leftover) { + ERR("Unknown argument: %s", leftover); + ret = CMD_ERROR; + goto end; + } + ret = view_trace(); end: