projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Notify the user if a filter is already enabled
[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 a2c8a68b233e0ed7beeef1b893c7f453b874e08d..90172e50a58d554c95b4cf502132584e2d59097f 100644
(file)
--- a/
src/bin/lttng/commands/enable_events.c
+++ b/
src/bin/lttng/commands/enable_events.c
@@
-369,7
+369,7
@@
static int enable_events(char *session_name)
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) {
- case LTT
COMM
_KERN_EVENT_EXIST:
+ case LTT
NG_ERR
_KERN_EVENT_EXIST:
WARN("Kernel events already enabled (channel %s, session %s)",
channel_name, session_name);
break;
WARN("Kernel events already enabled (channel %s, session %s)",
channel_name, session_name);
break;
@@
-384,7
+384,17
@@
static int enable_events(char *session_name)
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) {
- ERR("Error setting filter");
+ switch (-ret) {
+ case LTTNG_ERR_FILTER_EXIST:
+ ERR("Filter on events is already enabled"
+ " (channel %s, session %s)",
+ channel_name, session_name);
+ break;
+ default:
+ ERR("Error setting filter");
+ break;
+ }
+
ret = -1;
goto error;
}
ret = -1;
goto error;
}
@@
-536,7
+546,7
@@
static int enable_events(char *session_name)
if (ret < 0) {
/* Turn ret to positive value to handle the positive error code */
switch (-ret) {
if (ret < 0) {
/* Turn ret to positive value to handle the positive error code */
switch (-ret) {
- case LTT
COMM
_KERN_EVENT_EXIST:
+ case LTT
NG_ERR
_KERN_EVENT_EXIST:
WARN("Kernel event %s already enabled (channel %s, session %s)",
event_name, channel_name, session_name);
break;
WARN("Kernel event %s already enabled (channel %s, session %s)",
event_name, channel_name, session_name);
break;
@@
-554,7
+564,17
@@
static int enable_events(char *session_name)
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) {
- ERR("Error setting filter");
+ switch (-ret) {
+ case LTTNG_ERR_FILTER_EXIST:
+ ERR("Filter on event %s is already enabled"
+ " (channel %s, session %s)",
+ event_name, channel_name, session_name);
+ break;
+ default:
+ ERR("Error setting filter");
+ break;
+ }
+
ret = -1;
goto error;
}
ret = -1;
goto error;
}
This page took
0.02531 seconds
and
4
git commands to generate.