X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fevent-rule.c;h=6071bb8dcef5059c088c671a796d2510432df188;hp=3a5be731b3fffe7c48d1613c538dd996c63dc930;hb=refs%2Fheads%2Fsow-2020-0002-rev2;hpb=11f6ce94d8fb73f017888681aaba5d7df55fc735

diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index 3a5be731b..6071bb8dc 100644
--- a/src/common/event-rule/event-rule.c
+++ b/src/common/event-rule/event-rule.c
@@ -14,10 +14,11 @@
 #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-function-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(
@@ -41,9 +42,9 @@ enum lttng_domain_type lttng_event_rule_get_domain_type(
 		break;
 	}
 	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
-	case LTTNG_EVENT_RULE_TYPE_KPROBE:
-	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
-	case LTTNG_EVENT_RULE_TYPE_UPROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
+	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:
@@ -172,14 +173,14 @@ ssize_t lttng_event_rule_create_from_payload(
 		create_from_payload =
 				lttng_event_rule_tracepoint_create_from_payload;
 		break;
-	case LTTNG_EVENT_RULE_TYPE_KPROBE:
-		create_from_payload = lttng_event_rule_kprobe_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:
-		/* TODO */
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
+		create_from_payload = lttng_event_rule_kernel_function_create_from_payload;
 		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 =
@@ -315,11 +316,11 @@ const char *lttng_event_rule_type_str(enum lttng_event_rule_type type)
 		return "tracepoint";
 	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
 		return "syscall";
-	case LTTNG_EVENT_RULE_TYPE_KPROBE:
+	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();