Introduce lttng_event_rule_jul_logging

[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 291ef533c280eef3b013dc537fed9c9428b87072..8c68d62b88d8444738d867acc7bd5cb7b18deb27 100644 (file)
--- a/src/common/event-rule/event-rule.c
+++ b/src/common/event-rule/event-rule.c
@@ -14,10 +14,13 @@
 #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/jul-logging-internal.h>
 #include <lttng/event-rule/tracepoint-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 +43,17 @@ enum lttng_domain_type lttng_event_rule_get_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_KERNEL_SYSCALL:
-       case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
+       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,8 +182,8 @@ 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_KERNEL_FUNCTION:
                /* TODO */
@@ -185,6 +195,18 @@ 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;
        default:
                ERR("Attempted to create event rule of unknown type (%i)",
                                (int) event_rule_comm->event_rule_type);
@@ -315,12 +337,18 @@ const char *lttng_event_rule_type_str(enum lttng_event_rule_type type)
                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_KPROBE:
+               return "kernel kprobe";
        case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
                return "function";
        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";
        default:
                abort();
        }