/*
- * Copyright (C) 2011 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2011 David Goulet <dgoulet@efficios.com>
*
- * 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.
+ * SPDX-License-Identifier: GPL-2.0-only
*
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#define _LGPL_SOURCE
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;
+static const char *babeltrace2_bin = CONFIG_BABELTRACE2_BIN;
#ifdef LTTNG_EMBED_HELP
static const char help_msg[] =
* This is needed for each viewer since we are using execvp().
*/
static const char *babeltrace_opts[] = { "babeltrace" };
-//static const char *lttv_gui_opts[] = { "lttv-gui", "-t", };
+static const char *babeltrace2_opts[] = { "babeltrace2" };
/*
* Type is also use as the index in the viewers array. So please, make sure
*/
enum viewer_type {
VIEWER_BABELTRACE = 0,
- VIEWER_LTTV_GUI = 1,
+ VIEWER_BABELTRACE2 = 1,
VIEWER_USER_DEFINED = 2,
};
* NOTE: "lttv" is a shell command and it's not working for exec() family
* functions so we might think of removing this wrapper or using bash.
*/
-static struct viewers {
+static const struct viewers {
const char *exec_name;
enum viewer_type type;
} viewers[] = {
{ "babeltrace", VIEWER_BABELTRACE },
- { "lttv-gui", VIEWER_LTTV_GUI },
+ { "babeltrace2", VIEWER_BABELTRACE2 },
{ NULL, VIEWER_USER_DEFINED },
};
/* Is the session we are trying to view is in live mode. */
static int session_live_mode;
-static struct viewers *parse_options(void)
+static const struct viewers *parse_options(void)
{
if (opt_viewer == NULL) {
/* Default is babeltrace */
- return &(viewers[VIEWER_BABELTRACE]);
+ return &(viewers[VIEWER_BABELTRACE2]);
}
/*
char **argv;
size_t size, mem_len;
-
/* Add one for the NULL terminating element. */
mem_len = opts_len + 1;
if (session_live_mode) {
goto error;
}
- memcpy(argv, opts, opts_len);
+ memcpy(argv, opts, sizeof(char *) * opts_len);
if (session_live_mode) {
- argv[opts_len] = "-i";
- argv[opts_len + 1] = "lttng-live";
+ argv[opts_len] = (char *) "-i";
+ argv[opts_len + 1] = (char *) "lttng-live";
argv[opts_len + 2] = (char *) trace_path;
argv[opts_len + 3] = NULL;
} else {
int ret = 0;
struct stat status;
const char *viewer_bin = NULL;
- struct viewers *viewer;
+ const struct viewers *viewer;
char **argv = NULL;
/* Check for --viewer options */
goto error;
}
+retry_viewer:
switch (viewer->type) {
+ case VIEWER_BABELTRACE2:
+ if (stat(babeltrace2_bin, &status) == 0) {
+ viewer_bin = babeltrace2_bin;
+ } else {
+ viewer_bin = viewer->exec_name;
+ }
+ argv = alloc_argv_from_local_opts(babeltrace2_opts,
+ ARRAY_SIZE(babeltrace2_opts), trace_path);
+ break;
case VIEWER_BABELTRACE:
if (stat(babeltrace_bin, &status) == 0) {
viewer_bin = babeltrace_bin;
ret = execvp(viewer_bin, argv);
if (ret) {
- if (errno == ENOENT) {
- ERR("%s not found on the system", viewer_bin);
+ if (errno == ENOENT && viewer->exec_name) {
+ if (viewer->type == VIEWER_BABELTRACE2) {
+ /* Fallback to legacy babeltrace. */
+ DBG("babeltrace2 not installed on the system, falling back to babeltrace 1.x");
+ viewer = &viewers[VIEWER_BABELTRACE];
+ free(argv);
+ argv = NULL;
+ goto retry_viewer;
+ } else {
+ ERR("Viewer \"%s\" not found on the system",
+ viewer_bin);
+ }
} else {
- PERROR("exec: %s", viewer_bin);
+ PERROR("Failed to launch \"%s\" viewer", viewer_bin);
}
ret = CMD_FATAL;
goto error;