X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=4e5216edcf3274acbc01937038b3fe8c52316fb7;hb=d602bd6a8ee25d5ca662dde4edb3db3cabf264e1;hp=54e745474d89c8c891bc78f8a35b8ce742f53cd0;hpb=bbd6675c857ad9bf95e59446476cab19d1f6736e;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 54e745474..4e5216edc 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -32,7 +32,7 @@
 #include <lttng/condition/event-rule-internal.h>
 #include <lttng/event-rule/event-rule.h>
 #include <lttng/event-rule/event-rule-internal.h>
-#include <lttng/event-rule/uprobe-internal.h>
+#include <lttng/event-rule/userspace-probe-internal.h>
 
 #include "lttng-sessiond.h"
 #include "lttng-syscall.h"
@@ -540,9 +540,9 @@ static int userspace_probe_event_rule_add_callsites(
 	assert(creds);
 
 	event_rule_type = lttng_event_rule_get_type(rule);
-	assert(event_rule_type == LTTNG_EVENT_RULE_TYPE_UPROBE);
+	assert(event_rule_type == LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE);
 
-	status = lttng_event_rule_uprobe_get_location(rule, &location);
+	status = lttng_event_rule_userspace_probe_get_location(rule, &location);
 	if (status != LTTNG_EVENT_RULE_STATUS_OK || !location) {
 		ret = -1;
 		goto end;
@@ -2310,10 +2310,10 @@ static enum lttng_error_code kernel_create_event_notifier_rule(
 	assert(condition);
 
 	condition_type = lttng_condition_get_type(condition);
-	assert(condition_type == LTTNG_CONDITION_TYPE_EVENT_RULE_HIT);
+	assert(condition_type == LTTNG_CONDITION_TYPE_ON_EVENT);
 
 	/* Does not acquire a reference. */
-	condition_status = lttng_condition_event_rule_get_rule(
+	condition_status = lttng_condition_on_event_get_rule(
 			condition, &event_rule);
 	assert(condition_status == LTTNG_CONDITION_STATUS_OK);
 	assert(event_rule);
@@ -2386,7 +2386,7 @@ static enum lttng_error_code kernel_create_event_notifier_rule(
 	}
 
 	if (lttng_event_rule_get_type(event_rule) ==
-			LTTNG_EVENT_RULE_TYPE_UPROBE) {
+			LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE) {
 		ret = userspace_probe_event_rule_add_callsites(
 				event_rule, creds, event_notifier_rule->fd);
 		if (ret) {
@@ -2395,14 +2395,14 @@ static enum lttng_error_code kernel_create_event_notifier_rule(
 		}
 	}
 
-	/* Set the capture bytecode, if any. */
-	cond_status = lttng_condition_event_rule_get_capture_descriptor_count(
+	/* Set the capture bytecode if any. */
+	cond_status = lttng_condition_on_event_get_capture_descriptor_count(
 			condition, &capture_bytecode_count);
 	assert(cond_status == LTTNG_CONDITION_STATUS_OK);
 
 	for (i = 0; i < capture_bytecode_count; i++) {
 		const struct lttng_bytecode *capture_bytecode =
-				lttng_condition_event_rule_get_capture_bytecode_at_index(
+				lttng_condition_on_event_get_capture_bytecode_at_index(
 						condition, i);
 
 		if (capture_bytecode == NULL) {
@@ -2479,7 +2479,7 @@ enum lttng_error_code kernel_register_event_notifier(
 	assert(condition);
 
 	/* Does not acquire a reference to the event rule. */
-	status = lttng_condition_event_rule_get_rule(
+	status = lttng_condition_on_event_get_rule(
 			condition, &event_rule);
 	assert(status == LTTNG_CONDITION_STATUS_OK);