X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcondition-internal.c;h=07b32f86d611367820e743ebea9a754b3ffe064c;hp=dc21ca3afbc5931a09850b5625e7784d3984b52b;hb=246611b0dffa58fbc0e2329ddf6f9dc9d9eff7ce;hpb=e98a976a8b6dbd488b1277a48e7775c76df6c79f

diff --git a/src/bin/lttng-sessiond/condition-internal.c b/src/bin/lttng-sessiond/condition-internal.c
index dc21ca3af..07b32f86d 100644
--- a/src/bin/lttng-sessiond/condition-internal.c
+++ b/src/bin/lttng-sessiond/condition-internal.c
@@ -13,9 +13,10 @@
 #include <lttng/condition/buffer-usage-internal.h>
 #include <lttng/condition/session-consumed-size-internal.h>
 #include <lttng/condition/session-rotation-internal.h>
-#include <lttng/condition/event-rule-internal.h>
-#include <lttng/condition/event-rule.h>
+#include <lttng/condition/on-event-internal.h>
+#include <lttng/condition/on-event.h>
 #include <lttng/event-rule/event-rule-internal.h>
+#include <lttng/condition/on-event-internal.h>
 #include "condition-internal.h"
 
 static
@@ -95,7 +96,7 @@ unsigned long lttng_condition_session_rotation_hash(
 }
 
 static
-unsigned long lttng_condition_event_rule_hash(
+unsigned long lttng_condition_on_event_hash(
 	const struct lttng_condition *condition)
 {
 	unsigned long hash, condition_type;
@@ -103,8 +104,7 @@ unsigned long lttng_condition_event_rule_hash(
 	const struct lttng_event_rule *event_rule;
 
 	condition_type = (unsigned long) condition->type;
-
-	condition_status = lttng_condition_event_rule_get_rule(condition,
+	condition_status = lttng_condition_on_event_get_rule(condition,
 			&event_rule);
 	assert(condition_status == LTTNG_CONDITION_STATUS_OK);
 
@@ -128,8 +128,8 @@ unsigned long lttng_condition_hash(const struct lttng_condition *condition)
 	case LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING:
 	case LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED:
 		return lttng_condition_session_rotation_hash(condition);
-	case LTTNG_CONDITION_TYPE_EVENT_RULE_HIT:
-		return lttng_condition_event_rule_hash(condition);
+	case LTTNG_CONDITION_TYPE_ON_EVENT:
+		return lttng_condition_on_event_hash(condition);
 	default:
 		//ERR("[notification-thread] Unexpected condition type caught");
 		abort();