X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-kernel.c;h=0ab1b6864808fd687d869956472ac1df63b581b6;hb=46fd07accf36998fca3e43e54513755a98f68f48;hp=3a32893a199bef28cea52b13cb8415886ecfe24f;hpb=b8e2fb80c105c5a8241f7b35744e4a86d7e4125c;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c
index 3a32893a1..0ab1b6864 100644
--- a/src/bin/lttng-sessiond/trace-kernel.c
+++ b/src/bin/lttng-sessiond/trace-kernel.c
@@ -20,11 +20,11 @@
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/event-rule/kernel-probe.h>
 #include <lttng/event-rule/kernel-probe-internal.h>
-#include <lttng/event-rule/syscall.h>
-#include <lttng/event-rule/syscall-internal.h>
+#include <lttng/event-rule/kernel-syscall.h>
+#include <lttng/event-rule/kernel-syscall-internal.h>
 #include <lttng/event-rule/tracepoint.h>
 #include <lttng/event-rule/tracepoint-internal.h>
-#include <lttng/event-rule/userspace-probe-internal.h>
+#include <lttng/event-rule/kernel-uprobe-internal.h>
 #include <common/common.h>
 #include <common/defaults.h>
 #include <common/trace-chunk.h>
@@ -608,13 +608,13 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
 		ret_code = LTTNG_OK;
 		break;
 	}
-	case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
 	{
 		const struct lttng_userspace_probe_location* location = NULL;
 		const struct lttng_userspace_probe_location_lookup_method *lookup = NULL;
 		enum lttng_event_rule_status status;
 
-		status = lttng_event_rule_userspace_probe_get_location(rule, &location);
+		status = lttng_event_rule_kernel_uprobe_get_location(rule, &location);
 		if (status != LTTNG_EVENT_RULE_STATUS_OK) {
 			ret_code = LTTNG_ERR_PROBE_LOCATION_INVAL;
 			goto error;
@@ -649,7 +649,7 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
 			abort();
 		}
 
-		status = lttng_event_rule_userspace_probe_get_event_name(
+		status = lttng_event_rule_kernel_uprobe_get_event_name(
 				rule, &name);
 		assert(status == LTTNG_EVENT_RULE_STATUS_OK);
 		ret_code = LTTNG_OK;
@@ -660,7 +660,7 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
 		const enum lttng_domain_type domain =
 				lttng_event_rule_get_domain_type(rule);
 		const enum lttng_event_rule_status status =
-				lttng_event_rule_tracepoint_get_pattern(
+				lttng_event_rule_tracepoint_get_name_pattern(
 						rule, &name);
 
 		assert(domain == LTTNG_DOMAIN_KERNEL);
@@ -671,27 +671,27 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
 		ret_code = LTTNG_OK;
 		break;
 	}
-	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL:
 	{
 		const enum lttng_event_rule_status status =
-				lttng_event_rule_syscall_get_pattern(
+				lttng_event_rule_kernel_syscall_get_name_pattern(
 						rule, &name);
-		const enum lttng_event_rule_syscall_emission_site_type
-			emission_site_type =
-			lttng_event_rule_syscall_get_emission_site_type(rule);
+		const enum lttng_event_rule_kernel_syscall_emission_site
+			emission_site =
+			lttng_event_rule_kernel_syscall_get_emission_site(rule);
 		enum lttng_kernel_abi_syscall_entryexit entryexit;
 
 		assert(status == LTTNG_EVENT_RULE_STATUS_OK);
-		assert(emission_site_type != LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_UNKNOWN);
+		assert(emission_site != LTTNG_EVENT_RULE_KERNEL_SYSCALL_EMISSION_SITE_UNKNOWN);
 
-		switch(emission_site_type) {
-		case LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY:
+		switch(emission_site) {
+		case LTTNG_EVENT_RULE_KERNEL_SYSCALL_EMISSION_SITE_ENTRY:
 			entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
 			break;
-		case LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_EXIT:
+		case LTTNG_EVENT_RULE_KERNEL_SYSCALL_EMISSION_SITE_EXIT:
 			entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
 			break;
-		case LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY_EXIT:
+		case LTTNG_EVENT_RULE_KERNEL_SYSCALL_EMISSION_SITE_ENTRY_EXIT:
 			entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT;
 			break;
 		default: