projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Warn if session is running with lttng view
[lttng-tools.git]
/
src
/
bin
/
lttng
/
commands
/
enable_events.c
diff --git
a/src/bin/lttng/commands/enable_events.c
b/src/bin/lttng/commands/enable_events.c
index 0bd96eb303680cc715dced1bda4eb845d74c75eb..4a76267baada7f23619b89517a510afff69be0ee 100644
(file)
--- a/
src/bin/lttng/commands/enable_events.c
+++ b/
src/bin/lttng/commands/enable_events.c
@@
-301,6
+301,7
@@
int loglevel_str_to_value(const char *inputstr)
static int enable_events(char *session_name)
{
int err, ret = CMD_SUCCESS, warn = 0;
static int enable_events(char *session_name)
{
int err, ret = CMD_SUCCESS, warn = 0;
+ unsigned int event_enabled = 0;
char *event_name, *channel_name = NULL;
struct lttng_event ev;
struct lttng_domain dom;
char *event_name, *channel_name = NULL;
struct lttng_event ev;
struct lttng_domain dom;
@@
-358,7
+359,7
@@
static int enable_events(char *session_name)
ev.loglevel = loglevel_str_to_value(opt_loglevel);
if (ev.loglevel == -1) {
ERR("Unknown loglevel %s", opt_loglevel);
ev.loglevel = loglevel_str_to_value(opt_loglevel);
if (ev.loglevel == -1) {
ERR("Unknown loglevel %s", opt_loglevel);
- ret = -
1
;
+ ret = -
LTTNG_ERR_INVALID
;
goto error;
}
} else {
goto error;
}
} else {
@@
-366,6
+367,9
@@
static int enable_events(char *session_name)
}
}
}
}
+ /* Reset flag before enabling a new event. */
+ event_enabled = 0;
+
ret = lttng_enable_event(handle, &ev, channel_name);
if (ret < 0) {
switch (-ret) {
ret = lttng_enable_event(handle, &ev, channel_name);
if (ret < 0) {
switch (-ret) {
@@
-380,6
+384,7
@@
static int enable_events(char *session_name)
}
goto end;
}
}
goto end;
}
+ event_enabled = 1;
switch (opt_event_type) {
case LTTNG_EVENT_TRACEPOINT:
switch (opt_event_type) {
case LTTNG_EVENT_TRACEPOINT:
@@
-416,10
+421,11
@@
static int enable_events(char *session_name)
*/
goto error;
}
*/
goto error;
}
- if (opt_filter) {
+ if (opt_filter
&& event_enabled
) {
ret = lttng_set_event_filter(handle, ev.name, channel_name,
opt_filter);
if (ret < 0) {
ret = lttng_set_event_filter(handle, ev.name, channel_name,
opt_filter);
if (ret < 0) {
+ fprintf(stderr, "Ret filter: %d\n", ret);
switch (-ret) {
case LTTNG_ERR_FILTER_EXIST:
WARN("Filter on events is already enabled"
switch (-ret) {
case LTTNG_ERR_FILTER_EXIST:
WARN("Filter on events is already enabled"
@@
-546,7
+552,7
@@
static int enable_events(char *session_name)
ev.loglevel = loglevel_str_to_value(opt_loglevel);
if (ev.loglevel == -1) {
ERR("Unknown loglevel %s", opt_loglevel);
ev.loglevel = loglevel_str_to_value(opt_loglevel);
if (ev.loglevel == -1) {
ERR("Unknown loglevel %s", opt_loglevel);
- ret = -
1
;
+ ret = -
LTTNG_ERR_INVALID
;
goto error;
}
} else {
goto error;
}
} else {
@@
-558,6
+564,9
@@
static int enable_events(char *session_name)
goto error;
}
goto error;
}
+ /* Reset flag before enabling a new event. */
+ event_enabled = 0;
+
ret = lttng_enable_event(handle, &ev, channel_name);
if (ret < 0) {
/* Turn ret to positive value to handle the positive error code */
ret = lttng_enable_event(handle, &ev, channel_name);
if (ret < 0) {
/* Turn ret to positive value to handle the positive error code */
@@
-575,8
+584,9
@@
static int enable_events(char *session_name)
} else {
MSG("%s event %s created in channel %s",
opt_kernel ? "kernel": "UST", event_name, channel_name);
} else {
MSG("%s event %s created in channel %s",
opt_kernel ? "kernel": "UST", event_name, channel_name);
+ event_enabled = 1;
}
}
- if (opt_filter) {
+ if (opt_filter
&& event_enabled
) {
ret = lttng_set_event_filter(handle, ev.name, channel_name,
opt_filter);
if (ret < 0) {
ret = lttng_set_event_filter(handle, ev.name, channel_name,
opt_filter);
if (ret < 0) {
This page took
0.024694 seconds
and
4
git commands to generate.