X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fevent-rule%2Fevent-rule.c;h=841e182b37fbf7bc69c46db391759a6e6730d056;hb=40fd2ccf9faa3e8b6d67d40c8ee52a2b3d1f07bd;hp=c6ccc857732c7fc4393055e8360e6243abdca513;hpb=f27911615bc5907d61d8ea236da974090bd85d24;p=lttng-tools.git

diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index c6ccc8577..841e182b3 100644
--- a/src/common/event-rule/event-rule.c
+++ b/src/common/event-rule/event-rule.c
@@ -14,10 +14,10 @@
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>
 #include <lttng/event-rule/event-rule-internal.h>
-#include <lttng/event-rule/kprobe-internal.h>
+#include <lttng/event-rule/kernel-probe-internal.h>
 #include <lttng/event-rule/syscall-internal.h>
 #include <lttng/event-rule/tracepoint-internal.h>
-#include <lttng/event-rule/uprobe-internal.h>
+#include <lttng/event-rule/userspace-probe-internal.h>
 #include <stdbool.h>
 
 enum lttng_event_rule_type lttng_event_rule_get_type(
@@ -42,8 +42,8 @@ enum lttng_domain_type lttng_event_rule_get_domain_type(
 	}
 	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
-	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
-	case LTTNG_EVENT_RULE_TYPE_UPROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
+	case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE:
 		domain_type = LTTNG_DOMAIN_KERNEL;
 		break;
 	case LTTNG_EVENT_RULE_TYPE_UNKNOWN:
@@ -175,11 +175,11 @@ ssize_t lttng_event_rule_create_from_payload(
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
 		create_from_payload = lttng_event_rule_kernel_probe_create_from_payload;
 		break;
-	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
 		/* TODO */
 		break;
-	case LTTNG_EVENT_RULE_TYPE_UPROBE:
-		create_from_payload = lttng_event_rule_uprobe_create_from_payload;
+	case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE:
+		create_from_payload = lttng_event_rule_userspace_probe_create_from_payload;
 		break;
 	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
 		create_from_payload =
@@ -317,9 +317,9 @@ const char *lttng_event_rule_type_str(enum lttng_event_rule_type type)
 		return "syscall";
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
 		return "probe";
-	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
 		return "function";
-	case LTTNG_EVENT_RULE_TYPE_UPROBE:
+	case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE:
 		return "userspace-probe";
 	default:
 		abort();