X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fevent-rule.c;h=841e182b37fbf7bc69c46db391759a6e6730d056;hb=f2d09181d82a6b19908e15c3264be52c0c08c3b8;hp=a37559c70608cf174a5401854031521e0a506409;hpb=993578ff7c4fce4d9a834918d192f896ba3021c7;p=lttng-tools.git

diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index a37559c70..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(
@@ -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_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 +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:
+	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 =
@@ -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);
@@ -276,6 +276,36 @@ lttng_event_rule_generate_exclusions(const struct lttng_event_rule *rule,
 }
 
 LTTNG_HIDDEN
+struct lttng_event *lttng_event_rule_generate_lttng_event(
+		const struct lttng_event_rule *rule)
+{
+	assert(rule->generate_lttng_event);
+	return rule->generate_lttng_event(rule);
+}
+
+LTTNG_HIDDEN
+bool lttng_event_rule_targets_agent_domain(const struct lttng_event_rule *rule)
+{
+	bool targets_agent_domain = false;
+	enum lttng_domain_type type = lttng_event_rule_get_domain_type(rule);
+
+	switch (type) {
+	case LTTNG_DOMAIN_JUL:
+	case LTTNG_DOMAIN_LOG4J:
+	case LTTNG_DOMAIN_PYTHON:
+		targets_agent_domain = true;
+		break;
+	case LTTNG_DOMAIN_UST:
+	case LTTNG_DOMAIN_KERNEL:
+		targets_agent_domain = false;
+		break;
+	default:
+		abort();
+	};
+
+	return targets_agent_domain;
+}
+
 const char *lttng_event_rule_type_str(enum lttng_event_rule_type type)
 {
 	switch (type) {
@@ -285,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:
+	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();