X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fevent-rule.c;h=51d0b622039454f7f8575c282fc9fdb0b622aabe;hb=6530ec7ddc396cb95c2d223d0319ad94d3144dc3;hp=c6ccc857732c7fc4393055e8360e6243abdca513;hpb=f27911615bc5907d61d8ea236da974090bd85d24;p=lttng-tools.git

diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index c6ccc8577..51d0b6220 100644
--- a/src/common/event-rule/event-rule.c
+++ b/src/common/event-rule/event-rule.c
@@ -14,10 +14,15 @@
 #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/syscall-internal.h>
+#include <lttng/event-rule/kernel-kprobe-internal.h>
+#include <lttng/event-rule/kernel-syscall-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/tracepoint-internal.h>
-#include <lttng/event-rule/uprobe-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(
@@ -40,10 +45,23 @@ enum lttng_domain_type lttng_event_rule_get_domain_type(
 		assert(status == LTTNG_EVENT_RULE_STATUS_OK);
 		break;
 	}
-	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
-	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
-	case LTTNG_EVENT_RULE_TYPE_UPROBE:
+	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_KPROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
+	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:
@@ -172,18 +190,38 @@ ssize_t lttng_event_rule_create_from_payload(
 		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;
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
+		create_from_payload = lttng_event_rule_kernel_kprobe_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_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_kernel_tracepoint_create_from_payload;
 		break;
-	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
+	case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
 		create_from_payload =
-				lttng_event_rule_syscall_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)",
@@ -313,14 +351,25 @@ const char *lttng_event_rule_type_str(enum lttng_event_rule_type type)
 		return "unknown";
 	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
 		return "tracepoint";
-	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
-		return "syscall";
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
-		return "probe";
-	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
+	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_FUNCTION:
 		return "function";
-	case LTTNG_EVENT_RULE_TYPE_UPROBE:
-		return "userspace-probe";
+	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();
 	}