X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_event_rule.c;h=8d2ffe35f5488b2273cfb2b16d790885af5003fc;hb=85522de5747fee084e2e391678a79918355345da;hp=6d7328dbbe98f070b5a2ac4d36960c33af00f875;hpb=975d26c5fd28fdb1fe3771951df8939132d2f55b;p=lttng-tools.git

diff --git a/tests/unit/test_event_rule.c b/tests/unit/test_event_rule.c
index 6d7328dbb..8d2ffe35f 100644
--- a/tests/unit/test_event_rule.c
+++ b/tests/unit/test_event_rule.c
@@ -18,14 +18,14 @@
 #include <common/payload-view.h>
 #include <common/payload.h>
 #include <lttng/domain.h>
-#include <lttng/event-rule/kernel-probe-internal.h>
-#include <lttng/event-rule/kernel-probe.h>
-#include <lttng/event-rule/syscall-internal.h>
-#include <lttng/event-rule/syscall.h>
+#include <lttng/event-rule/kernel-kprobe-internal.h>
+#include <lttng/event-rule/kernel-kprobe.h>
+#include <lttng/event-rule/kernel-syscall-internal.h>
+#include <lttng/event-rule/kernel-syscall.h>
 #include <lttng/event-rule/tracepoint-internal.h>
 #include <lttng/event-rule/tracepoint.h>
-#include <lttng/event-rule/userspace-probe-internal.h>
-#include <lttng/event-rule/userspace-probe.h>
+#include <lttng/event-rule/kernel-uprobe-internal.h>
+#include <lttng/event-rule/kernel-uprobe.h>
 #include <lttng/event.h>
 #include <lttng/kernel-probe-internal.h>
 #include <lttng/kernel-probe.h>
@@ -184,18 +184,18 @@ static void test_event_rule_syscall(void)
 
 	lttng_payload_init(&payload);
 
-	syscall = lttng_event_rule_syscall_create(LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY);
+	syscall = lttng_event_rule_kernel_syscall_create(LTTNG_EVENT_RULE_KERNEL_SYSCALL_EMISSION_SITE_ENTRY);
 	ok(syscall, "syscall object.");
 
-	status = lttng_event_rule_syscall_set_pattern(syscall, pattern);
+	status = lttng_event_rule_kernel_syscall_set_name_pattern(syscall, pattern);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK, "setting pattern.");
-	status = lttng_event_rule_syscall_get_pattern(syscall, &tmp);
+	status = lttng_event_rule_kernel_syscall_get_name_pattern(syscall, &tmp);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK, "getting pattern.");
 	ok(!strncmp(pattern, tmp, strlen(pattern)), "pattern is equal.");
 
-	status = lttng_event_rule_syscall_set_filter(syscall, filter);
+	status = lttng_event_rule_kernel_syscall_set_filter(syscall, filter);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK, "setting filter.");
-	status = lttng_event_rule_syscall_get_filter(syscall, &tmp);
+	status = lttng_event_rule_kernel_syscall_get_filter(syscall, &tmp);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK, "getting filter.");
 	ok(!strncmp(filter, tmp, strlen(filter)), "filter is equal.");
 
@@ -255,10 +255,10 @@ static void test_event_rule_userspace_probe(void)
 
 	lttng_payload_init(&payload);
 
-	uprobe = lttng_event_rule_userspace_probe_create(probe_location);
+	uprobe = lttng_event_rule_kernel_uprobe_create(probe_location);
 	ok(uprobe, "uprobe event rule object creation.");
 
-	status = lttng_event_rule_userspace_probe_get_location(
+	status = lttng_event_rule_kernel_uprobe_get_location(
 			uprobe, &probe_location_tmp);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK,
 			"Getting uprobe event rule location.");
@@ -266,10 +266,10 @@ static void test_event_rule_userspace_probe(void)
 			   probe_location, probe_location_tmp),
 			"Location is equal.");
 
-	status = lttng_event_rule_userspace_probe_set_event_name(uprobe, probe_name);
+	status = lttng_event_rule_kernel_uprobe_set_event_name(uprobe, probe_name);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK,
 			"Setting uprobe event rule name: %s.", probe_name);
-	status = lttng_event_rule_userspace_probe_get_event_name(uprobe, &tmp);
+	status = lttng_event_rule_kernel_uprobe_get_event_name(uprobe, &tmp);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting uprobe name.");
 	ok(!strcmp(probe_name, tmp), "Uprobe name are equal.");
 
@@ -313,18 +313,18 @@ static void test_event_rule_kernel_probe_by_location(
 
 	lttng_payload_init(&payload);
 
-	kprobe = lttng_event_rule_kernel_probe_create(location);
+	kprobe = lttng_event_rule_kernel_kprobe_create(location);
 	ok(kprobe, "kprobe event rule object creation.");
 
-	status = lttng_event_rule_kernel_probe_get_location(kprobe, &_location);
+	status = lttng_event_rule_kernel_kprobe_get_location(kprobe, &_location);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK,
 			"Getting kprobe event rule location.");
 	ok(lttng_kernel_probe_location_is_equal(location, _location), "Locations are equal.");
 
-	status = lttng_event_rule_kernel_probe_set_event_name(kprobe, probe_name);
+	status = lttng_event_rule_kernel_kprobe_set_event_name(kprobe, probe_name);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK,
 			"Setting kprobe event rule name: %s.", probe_name);
-	status = lttng_event_rule_kernel_probe_get_event_name(kprobe, &tmp);
+	status = lttng_event_rule_kernel_kprobe_get_event_name(kprobe, &tmp);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting kprobe name.");
 	ok(!strcmp(probe_name, tmp), "kprobe name are equal.");