X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fevent-rule.c;h=dfb8febfe49dd78c3c0d40e29d5d598d73e3980e;hb=e957bf98e634c79b13281d0a2fe144be0245d310;hp=98ff37411b90f45b6be1810da4af802c00cf8986;hpb=44760c20f4fc255b63894ca758cf2ee5f253220b;p=lttng-tools.git

diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index 98ff37411..dfb8febfe 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(
@@ -41,9 +41,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_KERNEL_PROBE:
 	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
-	case LTTNG_EVENT_RULE_TYPE_UPROBE:
+	case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE:
 		domain_type = LTTNG_DOMAIN_KERNEL;
 		break;
 	case LTTNG_EVENT_RULE_TYPE_UNKNOWN:
@@ -172,14 +172,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 */
 		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 =
@@ -259,7 +259,7 @@ const char *lttng_event_rule_get_filter(const struct lttng_event_rule *rule)
 }
 
 LTTNG_HIDDEN
-const struct lttng_filter_bytecode *lttng_event_rule_get_filter_bytecode(
+const struct lttng_bytecode *lttng_event_rule_get_filter_bytecode(
 		const struct lttng_event_rule *rule)
 {
 	assert(rule->get_filter_bytecode);
@@ -315,11 +315,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:
 		return "function";
-	case LTTNG_EVENT_RULE_TYPE_UPROBE:
+	case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE:
 		return "userspace-probe";
 	default:
 		abort();