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 const struct viewers {
+static const struct viewer {
const char *exec_name;
enum viewer_type type;
} viewers[] = {
/* Is the session we are trying to view is in live mode. */
static int session_live_mode;
-static const struct viewers *parse_options(void)
+static const struct viewer *parse_viewer_option(void)
{
if (opt_viewer == NULL) {
- /* Default is babeltrace */
+ /* Default is babeltrace2 */
return &(viewers[VIEWER_BABELTRACE2]);
}
- /*
- * 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"
- * is passed and if not, add the trace directory to it.
- */
return &(viewers[VIEWER_USER_DEFINED]);
}
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;
- const struct viewers *viewer;
+ const struct viewer *viewer;
char **argv = NULL;
- /* Check for --viewer options */
- viewer = parse_options();
+ /* Check for --viewer option. */
+ viewer = parse_viewer_option();
if (viewer == NULL) {
ret = CMD_ERROR;
goto error;