X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;fp=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=45e356796d5b4693f86daa6313afa4e30c57a565;hp=72442314becaaeb294fb53696981f9763cdb536b;hb=8dbb86b8a981917165030d3a7fbbc2cb932888ed;hpb=670a26e4165562ab2dc5a16b9941f942e4f30996

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index 72442314b..45e356796 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -471,7 +471,7 @@ enum lttng_object_type get_condition_binding_object(
 	case LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING:
 	case LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED:
 		return LTTNG_OBJECT_TYPE_SESSION;
-	case LTTNG_CONDITION_TYPE_ON_EVENT:
+	case LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES:
 		return LTTNG_OBJECT_TYPE_NONE;
 	default:
 		return LTTNG_OBJECT_TYPE_UNKNOWN;
@@ -2336,12 +2336,12 @@ bool condition_is_supported(struct lttng_condition *condition)
 		is_supported = kernel_supports_ring_buffer_snapshot_sample_positions() == 1;
 		break;
 	}
-	case LTTNG_CONDITION_TYPE_ON_EVENT:
+	case LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES:
 	{
 		const struct lttng_event_rule *event_rule;
 		enum lttng_domain_type domain;
 		const enum lttng_condition_status status =
-				lttng_condition_on_event_get_rule(
+				lttng_condition_event_rule_matches_get_rule(
 						condition, &event_rule);
 
 		assert(status == LTTNG_CONDITION_STATUS_OK);
@@ -2602,7 +2602,7 @@ enum lttng_error_code setup_tracer_notifier(
 		goto error_remove_ht_element;
 	}
 
-	lttng_condition_on_event_set_error_counter_index(
+	lttng_condition_event_rule_matches_set_error_counter_index(
 			condition, error_counter_index);
 
 	ret = LTTNG_OK;
@@ -4569,7 +4569,7 @@ int dispatch_one_event_notifier_notification(struct notification_thread_state *s
 	trigger_status = lttng_trigger_get_name(element->trigger, &trigger_name);
 	assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
 
-	if (lttng_condition_on_event_get_capture_descriptor_count(
+	if (lttng_condition_event_rule_matches_get_capture_descriptor_count(
 			    lttng_trigger_get_const_condition(element->trigger),
 			    &capture_count) != LTTNG_CONDITION_STATUS_OK) {
 		ERR("Failed to get capture count");
@@ -4583,10 +4583,10 @@ int dispatch_one_event_notifier_notification(struct notification_thread_state *s
 		goto end;
 	}
 
-	evaluation = lttng_evaluation_on_event_create(
+	evaluation = lttng_evaluation_event_rule_matches_create(
 			container_of(lttng_trigger_get_const_condition(
 						     element->trigger),
-					struct lttng_condition_on_event,
+					struct lttng_condition_event_rule_matches,
 					parent),
 			notification->capture_buffer,
 			notification->capture_buf_size, false);