X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fview.c;h=db13ee22718d9fcc0c4eb9636bcd9593ef012032;hp=dd3c9a3cc225b06d2ff055fdfb7acdfe0bc141ef;hb=e223f308e0f0899d4c6d129922cad25d3b718efc;hpb=94e60b1f03ae2c3c9450ffc3eca8e052e2c37fb4 diff --git a/src/bin/lttng/commands/view.c b/src/bin/lttng/commands/view.c index dd3c9a3cc..db13ee227 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; @@ -76,29 +75,8 @@ static struct viewers { { NULL, VIEWER_USER_DEFINED }, }; -/* - * 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"); -} +/* Is the session we are trying to view is in live mode. */ +static int session_live_mode; static struct viewers *parse_options(void) { @@ -107,12 +85,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" @@ -148,7 +120,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; } @@ -156,6 +128,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++; } @@ -166,6 +141,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; } @@ -179,20 +161,38 @@ static char **alloc_argv_from_local_opts(const char **opts, size_t opts_len, const char *trace_path) { char **argv; - size_t size; + size_t size, mem_len; + + + /* Add one for the NULL terminating element. */ + mem_len = opts_len + 1; + if (session_live_mode) { + /* Add 3 option for the live mode being "-i lttng-live URL". */ + mem_len += 3; + } else { + /* Add option for the trace path. */ + mem_len += 1; + } - size = sizeof(char *) * opts_len; + size = sizeof(char *) * mem_len; /* Add two here for the trace_path and the NULL terminating element. */ - argv = malloc(size + 2); + argv = zmalloc(size); if (argv == NULL) { goto error; } memcpy(argv, opts, size); - argv[opts_len] = (char *)trace_path; - argv[opts_len + 1] = NULL; + if (session_live_mode) { + argv[opts_len] = "-i"; + argv[opts_len + 1] = "lttng-live"; + argv[opts_len + 2] = (char *) trace_path; + argv[opts_len + 3] = NULL; + } else { + argv[opts_len] = (char *) trace_path; + argv[opts_len + 1] = NULL; + } error: return argv; @@ -226,17 +226,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) { @@ -250,7 +239,7 @@ static int spawn_viewer(const char *trace_path) break; } - if (argv == NULL) { + if (argv == NULL || !viewer_bin) { ret = CMD_FATAL; goto error; } @@ -264,22 +253,48 @@ 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; } +/* + * Build the live path we need for the lttng live view. + */ +static char *build_live_path(char *session_name) +{ + int ret; + char *path = NULL; + char hostname[HOST_NAME_MAX]; + + ret = gethostname(hostname, sizeof(hostname)); + if (ret < 0) { + PERROR("gethostname"); + goto error; + } + + ret = asprintf(&path, "net://localhost/host/%s/%s", hostname, + session_name); + if (ret < 0) { + PERROR("asprintf live path"); + goto error; + } + +error: + return path; +} + /* * Exec viewer if found and use session name path. */ static int view_trace(void) { - int ret, count, i, found = 0; - char *session_name, *trace_path; + int ret; + char *session_name, *trace_path = NULL; struct lttng_session *sessions = NULL; /* @@ -314,6 +329,8 @@ static int view_trace(void) DBG("Viewing trace for session %s", session_name); if (session_name) { + int i, count, found = 0; + /* Getting all sessions */ count = lttng_list_sessions(&sessions); if (count < 0) { @@ -338,18 +355,32 @@ static int view_trace(void) goto free_sessions; } - trace_path = sessions[i].path; + session_live_mode = sessions[i].live_timer_interval; + + DBG("Session live mode set to %d", session_live_mode); + + if (sessions[i].enabled && !session_live_mode) { + WARN("Session %s is running. Please stop it before reading it.", + session_name); + ret = CMD_ERROR; + goto free_sessions; + } + + /* If the timer interval is set we are in live mode. */ + if (session_live_mode) { + trace_path = build_live_path(session_name); + if (!trace_path) { + ret = CMD_ERROR; + goto free_sessions; + } + } else { + /* Get file system session path. */ + trace_path = sessions[i].path; + } } else { trace_path = opt_trace_path; } - if (sessions[i].enabled) { - WARN("Session %s is running. Please stop it before reading it.", - session_name); - ret = CMD_ERROR; - goto free_sessions; - } - MSG("Trace directory: %s\n", trace_path); ret = spawn_viewer(trace_path); @@ -359,9 +390,10 @@ static int view_trace(void) } free_sessions: - if (sessions) { - free(sessions); + if (session_live_mode) { + free(trace_path); } + free(sessions); free_error: if (opt_session_name == NULL) { free(session_name); @@ -381,16 +413,19 @@ int cmd_view(int argc, const char **argv) pc = poptGetContext(NULL, argc, argv, long_options, 0); poptReadDefaultConfig(pc, 0); + if (lttng_opt_mi) { + WARN("mi does not apply to view command"); + } + 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; }