Remove lttng_event_rule_tracepoint

[lttng-tools.git] / src / common / event-rule / event-rule.c

diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index a664ee0e851037e17add207c7b2191bc07983231..e02a1c320d05fc6f25c5ad3d265b2d74a37bd12f 100644 (file)
--- a/src/common/event-rule/event-rule.c
+++ b/src/common/event-rule/event-rule.c
@@ -16,7 +16,9 @@
 #include <lttng/event-rule/event-rule-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>
@@ -35,16 +37,18 @@ 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);
-               break;
-       }
        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:
@@ -174,10 +178,6 @@ 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_KPROBE:
                create_from_payload = lttng_event_rule_kernel_kprobe_create_from_payload;
                break;
@@ -199,6 +199,18 @@ ssize_t lttng_event_rule_create_from_payload(
                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);
@@ -325,8 +337,6 @@ 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_KPROBE:
@@ -339,6 +349,13 @@ const char *lttng_event_rule_type_str(enum lttng_event_rule_type type)
                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();
        }