projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION
[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 8c68d62b88d8444738d867acc7bd5cb7b18deb27..b4225f8674f37595f58bf72757060de1c01d71ad 100644
(file)
--- a/
src/common/event-rule/event-rule.c
+++ b/
src/common/event-rule/event-rule.c
@@
-16,8
+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/event-rule-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/jul-logging-internal.h>
-#include <lttng/event-rule/
tracepoint
-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 <lttng/event-rule/kernel-tracepoint-internal.h>
#include <lttng/event-rule/kernel-uprobe-internal.h>
#include <lttng/event-rule/user-tracepoint-internal.h>
@@
-36,22
+37,20
@@
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)) {
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_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_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;
case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
domain_type = LTTNG_DOMAIN_KERNEL;
@@
-178,16
+177,9
@@
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) {
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;
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 */
- 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_UPROBE:
create_from_payload = lttng_event_rule_kernel_uprobe_create_from_payload;
break;
@@
-207,6
+199,14
@@
ssize_t lttng_event_rule_create_from_payload(
create_from_payload =
lttng_event_rule_jul_logging_create_from_payload;
break;
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);
default:
ERR("Attempted to create event rule of unknown type (%i)",
(int) event_rule_comm->event_rule_type);
@@
-333,14
+333,10
@@
const char *lttng_event_rule_type_str(enum lttng_event_rule_type type)
switch (type) {
case LTTNG_EVENT_RULE_TYPE_UNKNOWN:
return "unknown";
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:
return "kernel kprobe";
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_KERNEL_UPROBE:
return "kernel uprobe";
case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
return "kernel uprobe";
case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
@@
-349,6
+345,11
@@
const char *lttng_event_rule_type_str(enum lttng_event_rule_type type)
return "user tracepoint";
case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
return "jul logging";
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();
}
default:
abort();
}
This page took
0.025718 seconds
and
4
git commands to generate.