projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: sessiond: crash enabling event rules that differ only by loglevel type
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
cmd.cpp
diff --git
a/src/bin/lttng-sessiond/cmd.cpp
b/src/bin/lttng-sessiond/cmd.cpp
index c9924b326190dd4e765ff81af7175bf00a0b1410..60ae7fe6aa7632057962a1172fc2b571032bc075 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.cpp
+++ b/
src/bin/lttng-sessiond/cmd.cpp
@@
-2095,6
+2095,12
@@
static int _cmd_enable_event(struct ltt_session *session,
}
}
}
}
+ /* Normalize loglevel value to simplify comparisons. */
+ if (event->loglevel_type == LTTNG_EVENT_LOGLEVEL_ALL) {
+ /* Ignore the user-specified value; it has no meaning. */
+ event->loglevel = -1;
+ }
+
DBG("Enable event command for event \'%s\'", event->name);
lttng::urcu::read_lock_guard read_lock;
DBG("Enable event command for event \'%s\'", event->name);
lttng::urcu::read_lock_guard read_lock;
@@
-2338,6
+2344,7
@@
static int _cmd_enable_event(struct ltt_session *session,
memset(&uevent, 0, sizeof(uevent));
uevent.type = LTTNG_EVENT_TRACEPOINT;
uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
memset(&uevent, 0, sizeof(uevent));
uevent.type = LTTNG_EVENT_TRACEPOINT;
uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
+ uevent.loglevel = -1;
default_event_name = event_get_default_agent_ust_name(domain->type);
if (!default_event_name) {
ret = LTTNG_ERR_FATAL;
default_event_name = event_get_default_agent_ust_name(domain->type);
if (!default_event_name) {
ret = LTTNG_ERR_FATAL;
This page took
0.022881 seconds
and
4
git commands to generate.