projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactoring: use an opaque lttng_tracker_id type
[lttng-tools.git]
/
src
/
bin
/
lttng
/
commands
/
view.c
diff --git
a/src/bin/lttng/commands/view.c
b/src/bin/lttng/commands/view.c
index db13ee22718d9fcc0c4eb9636bcd9593ef012032..8e63a8997837079f2ef97a00ea9cfbe985f4a167 100644
(file)
--- a/
src/bin/lttng/commands/view.c
+++ b/
src/bin/lttng/commands/view.c
@@
-32,6
+32,12
@@
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 *babeltrace_bin = CONFIG_BABELTRACE_BIN;
//static const char *lttv_gui_bin = CONFIG_LTTV_GUI_BIN;
+#ifdef LTTNG_EMBED_HELP
+static const char help_msg[] =
+#include <lttng-view.1.h>
+;
+#endif
+
enum {
OPT_HELP = 1,
OPT_LIST_OPTIONS,
enum {
OPT_HELP = 1,
OPT_LIST_OPTIONS,
@@
-182,7
+188,7
@@
static char **alloc_argv_from_local_opts(const char **opts, size_t opts_len,
goto error;
}
goto error;
}
- memcpy(argv, opts, size);
+ memcpy(argv, opts, size
of(char *) * opts_len
);
if (session_live_mode) {
argv[opts_len] = "-i";
if (session_live_mode) {
argv[opts_len] = "-i";
@@
-296,6
+302,7
@@
static int view_trace(void)
int ret;
char *session_name, *trace_path = NULL;
struct lttng_session *sessions = NULL;
int ret;
char *session_name, *trace_path = NULL;
struct lttng_session *sessions = NULL;
+ bool free_trace_path = false;
/*
* Safety net. If lttng is suid at some point for *any* useless reasons,
/*
* Safety net. If lttng is suid at some point for *any* useless reasons,
@@
-373,6
+380,7
@@
static int view_trace(void)
ret = CMD_ERROR;
goto free_sessions;
}
ret = CMD_ERROR;
goto free_sessions;
}
+ free_trace_path = true;
} else {
/* Get file system session path. */
trace_path = sessions[i].path;
} else {
/* Get file system session path. */
trace_path = sessions[i].path;
@@
-390,7
+398,7
@@
static int view_trace(void)
}
free_sessions:
}
free_sessions:
- if (session_live_mode) {
+ if (session_live_mode
&& free_trace_path
) {
free(trace_path);
}
free(sessions);
free(trace_path);
}
free(sessions);
@@
-409,6
+417,7
@@
int cmd_view(int argc, const char **argv)
{
int opt, ret = CMD_SUCCESS;
static poptContext pc;
{
int opt, ret = CMD_SUCCESS;
static poptContext pc;
+ const char *leftover = NULL;
pc = poptGetContext(NULL, argc, argv, long_options, 0);
poptReadDefaultConfig(pc, 0);
pc = poptGetContext(NULL, argc, argv, long_options, 0);
poptReadDefaultConfig(pc, 0);
@@
-433,6
+442,13
@@
int cmd_view(int argc, const char **argv)
opt_session_name = (char*) poptGetArg(pc);
opt_session_name = (char*) poptGetArg(pc);
+ leftover = poptGetArg(pc);
+ if (leftover) {
+ ERR("Unknown argument: %s", leftover);
+ ret = CMD_ERROR;
+ goto end;
+ }
+
ret = view_trace();
end:
ret = view_trace();
end:
This page took
0.027534 seconds
and
4
git commands to generate.