X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fview.c;h=dd3c9a3cc225b06d2ff055fdfb7acdfe0bc141ef;hp=575109b86befce60e0a263f8aa90900b5c39debf;hb=94e60b1f03ae2c3c9450ffc3eca8e052e2c37fb4;hpb=6e9261f48bf897fe9de28a64f9d6ccbd31682e2f diff --git a/src/bin/lttng/commands/view.c b/src/bin/lttng/commands/view.c index 575109b86..dd3c9a3cc 100644 --- a/src/bin/lttng/commands/view.c +++ b/src/bin/lttng/commands/view.c @@ -1,18 +1,18 @@ /* * 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 the Free - * Software Foundation; only version 2 of the License. + * This program is free software; you can redistribute it and/or modify + * 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 MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #define _GNU_SOURCE @@ -29,6 +29,7 @@ static char *opt_session_name; static char *opt_viewer; +static char *opt_trace_path; static const char *babeltrace_bin = CONFIG_BABELTRACE_BIN; //static const char *lttv_gui_bin = CONFIG_LTTV_GUI_BIN; @@ -42,6 +43,7 @@ static struct poptOption long_options[] = { {"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0}, {"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL}, {"viewer", 'e', POPT_ARG_STRING, &opt_viewer, 0, 0, 0}, + {"trace-path", 't', POPT_ARG_STRING, &opt_trace_path, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 0} }; @@ -86,11 +88,15 @@ static void usage(FILE *ofp) 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.\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"); } @@ -198,7 +204,6 @@ error: static int spawn_viewer(const char *trace_path) { int ret = 0; - pid_t pid; struct stat status; const char *viewer_bin = NULL; struct viewers *viewer; @@ -211,61 +216,57 @@ static int spawn_viewer(const char *trace_path) goto error; } - pid = fork(); - if (pid == 0) { - switch (viewer->type) { - case VIEWER_BABELTRACE: - if (stat(babeltrace_bin, &status) == 0) { - viewer_bin = babeltrace_bin; - } else { - viewer_bin = viewer->exec_name; - } - argv = alloc_argv_from_local_opts(babeltrace_opts, - ARRAY_SIZE(babeltrace_opts), trace_path); - break; + switch (viewer->type) { + case VIEWER_BABELTRACE: + if (stat(babeltrace_bin, &status) == 0) { + viewer_bin = babeltrace_bin; + } else { + viewer_bin = viewer->exec_name; + } + 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; + 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) { - viewer_bin = argv[0]; - } - break; - default: - viewer_bin = viewers[VIEWER_BABELTRACE].exec_name; - argv = alloc_argv_from_local_opts(babeltrace_opts, - ARRAY_SIZE(babeltrace_opts), trace_path); - break; + case VIEWER_USER_DEFINED: + argv = alloc_argv_from_user_opts(opt_viewer, trace_path); + if (argv) { + viewer_bin = argv[0]; } + break; + default: + viewer_bin = viewers[VIEWER_BABELTRACE].exec_name; + argv = alloc_argv_from_local_opts(babeltrace_opts, + ARRAY_SIZE(babeltrace_opts), trace_path); + break; + } - if (argv == NULL) { - ret = CMD_FATAL; - goto error; - } + if (argv == NULL) { + ret = CMD_FATAL; + goto error; + } - DBG("Using %s viewer", viewer_bin); + DBG("Using %s viewer", viewer_bin); - ret = execvp(viewer_bin, argv); - if (ret) { + ret = execvp(viewer_bin, argv); + if (ret) { + if (errno == ENOENT) { + ERR("%s not found on the system", viewer_bin); + } else { PERROR("exec: %s", viewer_bin); - free(argv); - ret = CMD_FATAL; - goto error; } - } else if (pid > 0) { - ret = CMD_SUCCESS; - } else { - PERROR("Fork trace viewer"); + free(argv); ret = CMD_FATAL; + goto error; } error: @@ -278,12 +279,12 @@ error: static int view_trace(void) { int ret, count, i, found = 0; - char *session_name; + char *session_name, *trace_path; struct lttng_session *sessions = NULL; /* * Safety net. If lttng is suid at some point for *any* useless reasons, - * this prevent any bad execution of binraries. + * this prevent any bad execution of binaries. */ if (getuid() != 0) { if (getuid() != geteuid()) { @@ -297,7 +298,10 @@ static int view_trace(void) } } - if (opt_session_name == NULL) { + /* User define trace path override the session name */ + if (opt_trace_path) { + session_name = NULL; + } else if(opt_session_name == NULL) { session_name = get_session_name(); if (session_name == NULL) { ret = CMD_ERROR; @@ -309,39 +313,51 @@ static int view_trace(void) DBG("Viewing trace for session %s", session_name); - /* Getting all sessions */ - count = lttng_list_sessions(&sessions); - if (count < 0) { - ERR("Unable to list sessions. Session name %s not found.", - session_name); - MSG("Is there a session daemon running?"); - ret = CMD_ERROR; - goto free_error; - } + if (session_name) { + /* Getting all sessions */ + count = lttng_list_sessions(&sessions); + if (count < 0) { + ERR("Unable to list sessions. Session name %s not found.", + session_name); + MSG("Is there a session daemon running?"); + ret = CMD_ERROR; + goto free_error; + } - /* Find our session listed by the session daemon */ - for (i = 0; i < count; i++) { - if (strncmp(sessions[i].name, session_name, NAME_MAX) == 0) { - found = 1; - break; + /* Find our session listed by the session daemon */ + for (i = 0; i < count; i++) { + if (strncmp(sessions[i].name, session_name, NAME_MAX) == 0) { + found = 1; + break; + } } + + if (!found) { + MSG("Session name %s not found", session_name); + ret = CMD_ERROR; + goto free_sessions; + } + + trace_path = sessions[i].path; + } else { + trace_path = opt_trace_path; } - if (!found) { - MSG("Session name %s not found", session_name); + 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", sessions[i].path); + MSG("Trace directory: %s\n", trace_path); - ret = spawn_viewer(sessions[i].path); + ret = spawn_viewer(trace_path); if (ret < 0) { /* Don't set ret so lttng can interpret the sessiond error. */ goto free_sessions; } - ret = CMD_SUCCESS; - free_sessions: if (sessions) { free(sessions);