X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=60aa2cde85e9817492b54e3d559d36c73b709277;hb=881fc67f7002469477a5ad00e67a8077db6c0514;hp=125adb9a058bf4fdedac31a1daaeaa02733c26c5;hpb=2b00d46244cab86f1186a7b00cdc660f24a26f72;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index 125adb9a0..60aa2cde8 100644
--- 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 <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>
@@ -169,7 +169,7 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
 	rcu_read_lock();
 
 	uevent = trace_ust_find_event(uchan->events, event->name, filter,
-			(enum lttng_ust_loglevel_type) event->loglevel_type,
+			(enum lttng_ust_abi_loglevel_type) event->loglevel_type,
 			event->loglevel, exclusion);
 	if (!uevent) {
 		ret = trace_ust_create_event(event, filter_expression,
@@ -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) {
-		trigger_name = "(unnamed)";
+		trigger_name = "(anonymous)";
 	}
 
 	t_status = lttng_trigger_get_owner_uid(trigger, &trigger_owner_uid);
@@ -601,9 +601,10 @@ 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) ==
-			LTTNG_CONDITION_TYPE_EVENT_RULE_HIT);
+			LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES);
 
-	c_status = lttng_condition_event_rule_get_rule(condition, &rule);
+	c_status = lttng_condition_event_rule_matches_get_rule(
+			condition, &rule);
 	assert(c_status == LTTNG_CONDITION_STATUS_OK);
 
 	assert(lttng_event_rule_get_type(rule) ==
@@ -780,7 +781,7 @@ static int event_agent_disable_one(struct ltt_ust_session *usess,
 	 * ignored since the type is LTTNG_UST_LOGLEVEL_ALL.
 	 */
 	uevent = trace_ust_find_event(uchan->events, (char *) ust_event_name,
-			aevent->filter, LTTNG_UST_LOGLEVEL_ALL, -1, NULL);
+			aevent->filter, LTTNG_UST_ABI_LOGLEVEL_ALL, -1, NULL);
 	/* If the agent event exists, it must be available on the UST side. */
 	assert(uevent);