X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fevent-rule.c;h=b4225f8674f37595f58bf72757060de1c01d71ad;hb=1b8894d079813c9e8a29e2da64f6427e62514a0e;hp=291ef533c280eef3b013dc537fed9c9428b87072;hpb=e60e9a9a376ccb861fae175c41bcad7020b1dfc6;p=lttng-tools.git

diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index 291ef533c..b4225f867 100644
--- a/src/common/event-rule/event-rule.c
+++ b/src/common/event-rule/event-rule.c
@@ -14,10 +14,14 @@
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>
 #include <lttng/event-rule/event-rule-internal.h>
-#include <lttng/event-rule/kernel-probe-internal.h>
+#include <lttng/event-rule/kernel-kprobe-internal.h>
 #include <lttng/event-rule/kernel-syscall-internal.h>
-#include <lttng/event-rule/tracepoint-internal.h>
+#include <lttng/event-rule/log4j-logging-internal.h>
+#include <lttng/event-rule/jul-logging-internal.h>
+#include <lttng/event-rule/python-logging-internal.h>
+#include <lttng/event-rule/kernel-tracepoint-internal.h>
 #include <lttng/event-rule/kernel-uprobe-internal.h>
+#include <lttng/event-rule/user-tracepoint-internal.h>
 #include <stdbool.h>
 
 enum lttng_event_rule_type lttng_event_rule_get_type(
@@ -33,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_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_PROBE:
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
+	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:
@@ -168,15 +177,8 @@ ssize_t lttng_event_rule_create_from_payload(
 	consumed += sizeof(*event_rule_comm);
 
 	switch ((enum lttng_event_rule_type) event_rule_comm->event_rule_type) {
-	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
-		create_from_payload =
-				lttng_event_rule_tracepoint_create_from_payload;
-		break;
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
-		create_from_payload = lttng_event_rule_kernel_probe_create_from_payload;
-		break;
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
-		/* TODO */
+	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;
@@ -185,6 +187,26 @@ ssize_t lttng_event_rule_create_from_payload(
 		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_kernel_tracepoint_create_from_payload;
+		break;
+	case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
+		create_from_payload =
+				lttng_event_rule_user_tracepoint_create_from_payload;
+		break;
+	case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
+		create_from_payload =
+				lttng_event_rule_jul_logging_create_from_payload;
+		break;
+	case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
+		create_from_payload =
+				lttng_event_rule_log4j_logging_create_from_payload;
+		break;
+	case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
+		create_from_payload =
+				lttng_event_rule_python_logging_create_from_payload;
+		break;
 	default:
 		ERR("Attempted to create event rule of unknown type (%i)",
 				(int) event_rule_comm->event_rule_type);
@@ -311,16 +333,23 @@ 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_KERNEL_SYSCALL:
 		return "kernel syscall";
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
-		return "probe";
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
-		return "function";
+	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();
 	}