X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-kernel.c;h=bd06ba4ec5dc4f587486b855b5bcb9bd739d7205;hb=695f70446965aeac8b1118bb08d572630c96114d;hp=816cb9507a37f3fc7946384d9af0d7e5a675f776;hpb=8bc73626a406b3ee3b38b6d1df07ca82ed40dff7;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c
index 816cb9507..bd06ba4ec 100644
--- a/src/bin/lttng-sessiond/trace-kernel.c
+++ b/src/bin/lttng-sessiond/trace-kernel.c
@@ -18,13 +18,14 @@
 #include <lttng/userspace-probe-internal.h>
 #include <lttng/event-rule/event-rule.h>
 #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/tracepoint.h>
-#include <lttng/event-rule/tracepoint-internal.h>
-#include <lttng/event-rule/userspace-probe-internal.h>
+#include <lttng/event-rule/kernel-kprobe.h>
+#include <lttng/event-rule/kernel-kprobe-internal.h>
+#include <lttng/event-rule/kernel-syscall.h>
+#include <lttng/event-rule/kernel-syscall-internal.h>
+#include <lttng/event-rule/kernel-tracepoint.h>
+#include <lttng/event-rule/kernel-tracepoint-internal.h>
+#include <lttng/event-rule/kernel-uprobe.h>
+#include <lttng/event-rule/kernel-uprobe-internal.h>
 #include <common/common.h>
 #include <common/defaults.h>
 #include <common/trace-chunk.h>
@@ -552,7 +553,7 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
 	int strncpy_ret;
 
 	switch (lttng_event_rule_get_type(rule)) {
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
 	{
 		uint64_t address = 0, offset = 0;
 		const char *symbol_name = NULL;
@@ -560,7 +561,7 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
 		enum lttng_kernel_probe_location_status k_status;
 		enum lttng_event_rule_status status;
 
-		status = lttng_event_rule_kernel_probe_get_location(rule, &location);
+		status = lttng_event_rule_kernel_kprobe_get_location(rule, &location);
 		if (status != LTTNG_EVENT_RULE_STATUS_OK) {
 			ret_code = LTTNG_ERR_PROBE_LOCATION_INVAL;
 			goto error;
@@ -603,18 +604,18 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
 
 		kernel_event_notifier->event.u.kprobe.symbol_name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
 
-		status = lttng_event_rule_kernel_probe_get_event_name(rule, &name);
+		status = lttng_event_rule_kernel_kprobe_get_event_name(rule, &name);
 		assert(status == LTTNG_EVENT_RULE_STATUS_OK);
 		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,21 +650,18 @@ 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;
 		break;
 	}
-	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
 	{
-		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_name_pattern(
+				lttng_event_rule_kernel_tracepoint_get_name_pattern(
 						rule, &name);
 
-		assert(domain == LTTNG_DOMAIN_KERNEL);
 		assert(status == LTTNG_EVENT_RULE_STATUS_OK);
 		kernel_event_notifier->event.instrumentation =
 				LTTNG_KERNEL_ABI_TRACEPOINT;
@@ -671,27 +669,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: