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: notification: missing unlock on client skip
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
event.c
diff --git
a/src/bin/lttng-sessiond/event.c
b/src/bin/lttng-sessiond/event.c
index 17f510154cc29c2a28a7a00c7bc6497f60702fb3..ab39ca65a1cf2b1d92ffdffc44618a4e5d131307 100644
(file)
--- a/
src/bin/lttng-sessiond/event.c
+++ b/
src/bin/lttng-sessiond/event.c
@@
-13,7
+13,7
@@
#include <common/compat/errno.h>
#include <lttng/lttng.h>
#include <lttng/condition/condition.h>
#include <common/compat/errno.h>
#include <lttng/lttng.h>
#include <lttng/condition/condition.h>
-#include <lttng/condition/event-rule.h>
+#include <lttng/condition/event-rule
-matches
.h>
#include <lttng/event-rule/event-rule.h>
#include <lttng/event-rule/event-rule-internal.h>
#include <common/bytecode/bytecode.h>
#include <lttng/event-rule/event-rule.h>
#include <lttng/event-rule/event-rule-internal.h>
#include <common/bytecode/bytecode.h>
@@
-592,7
+592,7
@@
int trigger_agent_enable(const struct lttng_trigger *trigger, struct agent *agt)
t_status = lttng_trigger_get_name(trigger, &trigger_name);
if (t_status != LTTNG_TRIGGER_STATUS_OK) {
t_status = lttng_trigger_get_name(trigger, &trigger_name);
if (t_status != LTTNG_TRIGGER_STATUS_OK) {
- trigger_name = "(
unnamed
)";
+ trigger_name = "(
anonymous
)";
}
t_status = lttng_trigger_get_owner_uid(trigger, &trigger_owner_uid);
}
t_status = lttng_trigger_get_owner_uid(trigger, &trigger_owner_uid);
@@
-601,13
+601,21
@@
int trigger_agent_enable(const struct lttng_trigger *trigger, struct agent *agt)
condition = lttng_trigger_get_const_condition(trigger);
assert(lttng_condition_get_type(condition) ==
condition = lttng_trigger_get_const_condition(trigger);
assert(lttng_condition_get_type(condition) ==
- LTTNG_CONDITION_TYPE_
ON_EVENT
);
+ LTTNG_CONDITION_TYPE_
EVENT_RULE_MATCHES
);
- c_status = lttng_condition_on_event_get_rule(condition, &rule);
+ c_status = lttng_condition_event_rule_matches_get_rule(
+ condition, &rule);
assert(c_status == LTTNG_CONDITION_STATUS_OK);
assert(c_status == LTTNG_CONDITION_STATUS_OK);
- assert(lttng_event_rule_get_type(rule) ==
- LTTNG_EVENT_RULE_TYPE_TRACEPOINT);
+ switch (lttng_event_rule_get_type(rule)) {
+ case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
+ case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
+ case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
+ break;
+ default:
+ abort();
+ break;
+ }
d_type = lttng_event_rule_get_domain_type(rule);
assert(d_type == agt->domain);
d_type = lttng_event_rule_get_domain_type(rule);
assert(d_type == agt->domain);
This page took
0.02461 seconds
and
4
git commands to generate.