X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fview.c;h=dc37a09ddb58f83f01757dc5e89c75a46fa2deb9;hb=44c1a903e17ad14d5ba1cd07585a7a2415eac78a;hp=e3eff22ca394c6680babf7ef75a064bb7bc53b83;hpb=c617c0c651432f9d5ae7adf4c5c1a5fd92ad828e;p=lttng-tools.git diff --git a/src/bin/lttng/commands/view.c b/src/bin/lttng/commands/view.c index e3eff22ca..dc37a09dd 100644 --- a/src/bin/lttng/commands/view.c +++ b/src/bin/lttng/commands/view.c @@ -16,6 +16,7 @@ */ #define _GNU_SOURCE +#define _LGPL_SOURCE #include #include #include @@ -76,6 +77,9 @@ static struct viewers { { NULL, VIEWER_USER_DEFINED }, }; +/* Is the session we are trying to view is in live mode. */ +static int session_live_mode; + /* * usage */ @@ -148,7 +152,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 +160,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 +173,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 +193,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 +258,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 +271,7 @@ static int spawn_viewer(const char *trace_path) break; } - if (argv == NULL) { + if (argv == NULL || !viewer_bin) { ret = CMD_FATAL; goto error; } @@ -273,13 +294,39 @@ error: 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; - char *session_name, *trace_path; + char *session_name, *trace_path = NULL; struct lttng_session *sessions = NULL; /* @@ -340,14 +387,28 @@ static int view_trace(void) goto free_sessions; } - trace_path = sessions[i].path; + session_live_mode = sessions[i].live_timer_interval; - if (sessions[i].enabled) { + 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; } @@ -361,9 +422,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); @@ -383,6 +445,10 @@ 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: