X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fevent-rule.c;h=144000e0b2503c97f0295da0c9f63c41eda4565e;hp=b6a0e96e7388cef1bdc4ef40f0a2e05e5545c40e;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hpb=3e6e0df2f8f9f23d252c2508b6d741916dfcc4b3

diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index b6a0e96e7..144000e0b 100644
--- a/src/common/event-rule/event-rule.c
+++ b/src/common/event-rule/event-rule.c
@@ -6,16 +6,22 @@
  *
  */
 
-#include <assert.h>
 #include <common/error.h>
+#include <common/hashtable/hashtable.h>
+#include <common/hashtable/utils.h>
 #include <common/macros.h>
-#include <common/payload.h>
+#include <common/mi-lttng.h>
 #include <common/payload-view.h>
+#include <common/payload.h>
 #include <lttng/event-rule/event-rule-internal.h>
-#include <lttng/event-rule/kprobe-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/jul-logging-internal.h>
+#include <lttng/event-rule/kernel-kprobe-internal.h>
+#include <lttng/event-rule/kernel-syscall-internal.h>
+#include <lttng/event-rule/kernel-tracepoint-internal.h>
+#include <lttng/event-rule/kernel-uprobe-internal.h>
+#include <lttng/event-rule/log4j-logging-internal.h>
+#include <lttng/event-rule/python-logging-internal.h>
+#include <lttng/event-rule/user-tracepoint-internal.h>
 #include <stdbool.h>
 
 enum lttng_event_rule_type lttng_event_rule_get_type(
@@ -31,17 +37,22 @@ enum lttng_domain_type lttng_event_rule_get_domain_type(
 	enum lttng_domain_type domain_type = LTTNG_DOMAIN_NONE;
 
 	switch (lttng_event_rule_get_type(event_rule)) {
-	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
-	{
-		enum lttng_event_rule_status status;
-		status = lttng_event_rule_tracepoint_get_domain_type(event_rule, &domain_type);
-		assert(status == LTTNG_EVENT_RULE_STATUS_OK);
+	case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
+		domain_type = LTTNG_DOMAIN_UST;
 		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_JUL_LOGGING:
+		domain_type = LTTNG_DOMAIN_JUL;
+		break;
+	case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
+		domain_type = LTTNG_DOMAIN_LOG4J;
+		break;
+	case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
+		domain_type = LTTNG_DOMAIN_PYTHON;
+		break;
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
 		domain_type = LTTNG_DOMAIN_KERNEL;
 		break;
 	case LTTNG_EVENT_RULE_TYPE_UNKNOWN:
@@ -57,7 +68,7 @@ static void lttng_event_rule_release(struct urcu_ref *ref)
 	struct lttng_event_rule *event_rule =
 			container_of(ref, typeof(*event_rule), ref);
 
-	assert(event_rule->destroy);
+	LTTNG_ASSERT(event_rule->destroy);
 	event_rule->destroy(event_rule);
 }
 
@@ -161,27 +172,40 @@ ssize_t lttng_event_rule_create_from_payload(
 		goto end;
 	}
 
-	DBG("Deserializing event_rule from payload.");
+	DBG("Deserializing event_rule from payload");
 	event_rule_comm = (const struct lttng_event_rule_comm *) event_rule_comm_view.buffer.data;
 	consumed += sizeof(*event_rule_comm);
 
 	switch ((enum lttng_event_rule_type) event_rule_comm->event_rule_type) {
-	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
+		create_from_payload = lttng_event_rule_kernel_kprobe_create_from_payload;
+		break;
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
+		create_from_payload = lttng_event_rule_kernel_uprobe_create_from_payload;
+		break;
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL:
+		create_from_payload =
+				lttng_event_rule_kernel_syscall_create_from_payload;
+		break;
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
 		create_from_payload =
-				lttng_event_rule_tracepoint_create_from_payload;
+				lttng_event_rule_kernel_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_USER_TRACEPOINT:
+		create_from_payload =
+				lttng_event_rule_user_tracepoint_create_from_payload;
 		break;
-	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
-		/* TODO */
+	case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
+		create_from_payload =
+				lttng_event_rule_jul_logging_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_LOG4J_LOGGING:
+		create_from_payload =
+				lttng_event_rule_log4j_logging_create_from_payload;
 		break;
-	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
+	case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
 		create_from_payload =
-				lttng_event_rule_syscall_create_from_payload;
+				lttng_event_rule_python_logging_create_from_payload;
 		break;
 	default:
 		ERR("Attempted to create event rule of unknown type (%i)",
@@ -190,7 +214,7 @@ ssize_t lttng_event_rule_create_from_payload(
 		goto end;
 	}
 
-	assert(create_from_payload);
+	LTTNG_ASSERT(create_from_payload);
 
 	{
 		struct lttng_payload_view child_view =
@@ -236,58 +260,142 @@ void lttng_event_rule_put(struct lttng_event_rule *event_rule)
 		return;
 	}
 
-	assert(event_rule->ref.refcount);
+	LTTNG_ASSERT(event_rule->ref.refcount);
 	urcu_ref_put(&event_rule->ref, lttng_event_rule_release);
 }
 
 LTTNG_HIDDEN
 enum lttng_error_code lttng_event_rule_generate_filter_bytecode(
-		struct lttng_event_rule *rule, uid_t uid, gid_t gid)
+		struct lttng_event_rule *rule,
+		const struct lttng_credentials *creds)
 {
-	assert(rule->generate_filter_bytecode);
-	return rule->generate_filter_bytecode(rule, uid, gid);
+	LTTNG_ASSERT(rule->generate_filter_bytecode);
+	return rule->generate_filter_bytecode(rule, creds);
 }
 
 LTTNG_HIDDEN
 const char *lttng_event_rule_get_filter(const struct lttng_event_rule *rule)
 {
-	assert(rule->get_filter);
+	LTTNG_ASSERT(rule->get_filter);
 	return rule->get_filter(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);
+	LTTNG_ASSERT(rule->get_filter_bytecode);
 	return rule->get_filter_bytecode(rule);
 }
 
 LTTNG_HIDDEN
-struct lttng_event_exclusion *lttng_event_rule_generate_exclusions(
+enum lttng_event_rule_generate_exclusions_status
+lttng_event_rule_generate_exclusions(const struct lttng_event_rule *rule,
+		struct lttng_event_exclusion **exclusions)
+{
+	LTTNG_ASSERT(rule->generate_exclusions);
+	return rule->generate_exclusions(rule, exclusions);
+}
+
+LTTNG_HIDDEN
+struct lttng_event *lttng_event_rule_generate_lttng_event(
 		const struct lttng_event_rule *rule)
 {
-	assert(rule->generate_exclusions);
-	return rule->generate_exclusions(rule);
+	LTTNG_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) {
 	case LTTNG_EVENT_RULE_TYPE_UNKNOWN:
 		return "unknown";
-	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
-		return "tracepoint";
-	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
-		return "syscall";
-	case LTTNG_EVENT_RULE_TYPE_KPROBE:
-		return "probe";
-	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
-		return "function";
-	case LTTNG_EVENT_RULE_TYPE_UPROBE:
-		return "userspace-probe";
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL:
+		return "kernel syscall";
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
+		return "kernel kprobe";
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
+		return "kernel uprobe";
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
+		return "kernel tracepoint";
+	case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
+		return "user tracepoint";
+	case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
+		return "jul logging";
+	case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
+		return "log4j logging";
+	case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
+		return "python logging";
+
 	default:
 		abort();
 	}
 }
+
+LTTNG_HIDDEN
+unsigned long lttng_event_rule_hash(const struct lttng_event_rule *rule)
+{
+	LTTNG_ASSERT(rule->hash);
+	return rule->hash(rule);
+}
+
+LTTNG_HIDDEN
+enum lttng_error_code lttng_event_rule_mi_serialize(
+		const struct lttng_event_rule *rule, struct mi_writer *writer)
+{
+	int ret;
+	enum lttng_error_code ret_code;
+
+	LTTNG_ASSERT(rule);
+	LTTNG_ASSERT(writer);
+	LTTNG_ASSERT(rule->mi_serialize);
+
+	/* Open event rule element. */
+	ret = mi_lttng_writer_open_element(writer, mi_lttng_element_event_rule);
+	if (ret) {
+		goto mi_error;
+	}
+
+	/* Serialize underlying event rule. */
+	ret_code = rule->mi_serialize(rule, writer);
+	if (ret_code != LTTNG_OK) {
+		goto end;
+	}
+
+	/* Close event rule element. */
+	ret = mi_lttng_writer_close_element(writer);
+	if (ret) {
+		goto mi_error;
+	}
+
+	ret_code = LTTNG_OK;
+	goto end;
+
+mi_error:
+	ret_code = LTTNG_ERR_MI_IO_FAIL;
+end:
+	return ret_code;
+}