X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fevent-rule.c;h=144000e0b2503c97f0295da0c9f63c41eda4565e;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=dfb8febfe49dd78c3c0d40e29d5d598d73e3980e;hpb=e957bf98e634c79b13281d0a2fe144be0245d310;p=lttng-tools.git diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c index dfb8febfe..144000e0b 100644 --- a/src/common/event-rule/event-rule.c +++ b/src/common/event-rule/event-rule.c @@ -6,18 +6,22 @@ * */ -#include #include -#include -#include -#include #include #include +#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include 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_SYSCALL: - case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE: - case LTTNG_EVENT_RULE_TYPE_KRETPROBE: - case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE: + 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_UPROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT: domain_type = LTTNG_DOMAIN_KERNEL; break; case LTTNG_EVENT_RULE_TYPE_UNKNOWN: @@ -59,7 +68,7 @@ static void lttng_event_rule_release(struct urcu_ref *ref) struct lttng_event_rule *event_rule = container_of(ref, typeof(*event_rule), ref); - assert(event_rule->destroy); + LTTNG_ASSERT(event_rule->destroy); event_rule->destroy(event_rule); } @@ -168,22 +177,35 @@ 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: + 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; + break; + case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL: create_from_payload = - lttng_event_rule_tracepoint_create_from_payload; + lttng_event_rule_kernel_syscall_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_TRACEPOINT: + create_from_payload = + lttng_event_rule_kernel_tracepoint_create_from_payload; break; - case LTTNG_EVENT_RULE_TYPE_KRETPROBE: - /* TODO */ + case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT: + create_from_payload = + lttng_event_rule_user_tracepoint_create_from_payload; break; - case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE: - create_from_payload = lttng_event_rule_userspace_probe_create_from_payload; + 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_SYSCALL: + case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING: create_from_payload = - lttng_event_rule_syscall_create_from_payload; + lttng_event_rule_python_logging_create_from_payload; break; default: ERR("Attempted to create event rule of unknown type (%i)", @@ -192,7 +214,7 @@ ssize_t lttng_event_rule_create_from_payload( goto end; } - assert(create_from_payload); + LTTNG_ASSERT(create_from_payload); { struct lttng_payload_view child_view = @@ -238,7 +260,7 @@ void lttng_event_rule_put(struct lttng_event_rule *event_rule) return; } - assert(event_rule->ref.refcount); + LTTNG_ASSERT(event_rule->ref.refcount); urcu_ref_put(&event_rule->ref, lttng_event_rule_release); } @@ -247,14 +269,14 @@ enum lttng_error_code lttng_event_rule_generate_filter_bytecode( struct lttng_event_rule *rule, const struct lttng_credentials *creds) { - assert(rule->generate_filter_bytecode); + LTTNG_ASSERT(rule->generate_filter_bytecode); return rule->generate_filter_bytecode(rule, creds); } LTTNG_HIDDEN const char *lttng_event_rule_get_filter(const struct lttng_event_rule *rule) { - assert(rule->get_filter); + LTTNG_ASSERT(rule->get_filter); return rule->get_filter(rule); } @@ -262,7 +284,7 @@ LTTNG_HIDDEN const struct lttng_bytecode *lttng_event_rule_get_filter_bytecode( const struct lttng_event_rule *rule) { - assert(rule->get_filter_bytecode); + LTTNG_ASSERT(rule->get_filter_bytecode); return rule->get_filter_bytecode(rule); } @@ -271,7 +293,7 @@ enum lttng_event_rule_generate_exclusions_status lttng_event_rule_generate_exclusions(const struct lttng_event_rule *rule, struct lttng_event_exclusion **exclusions) { - assert(rule->generate_exclusions); + LTTNG_ASSERT(rule->generate_exclusions); return rule->generate_exclusions(rule, exclusions); } @@ -279,7 +301,7 @@ LTTNG_HIDDEN struct lttng_event *lttng_event_rule_generate_lttng_event( const struct lttng_event_rule *rule) { - assert(rule->generate_lttng_event); + LTTNG_ASSERT(rule->generate_lttng_event); return rule->generate_lttng_event(rule); } @@ -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_SYSCALL: - return "syscall"; - case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE: - return "probe"; - case LTTNG_EVENT_RULE_TYPE_KRETPROBE: - return "function"; - case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE: - return "userspace-probe"; + 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_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(); } @@ -329,6 +358,44 @@ const char *lttng_event_rule_type_str(enum lttng_event_rule_type type) LTTNG_HIDDEN unsigned long lttng_event_rule_hash(const struct lttng_event_rule *rule) { - assert(rule->hash); + LTTNG_ASSERT(rule->hash); return rule->hash(rule); } + +LTTNG_HIDDEN +enum lttng_error_code lttng_event_rule_mi_serialize( + const struct lttng_event_rule *rule, struct mi_writer *writer) +{ + int ret; + enum lttng_error_code ret_code; + + LTTNG_ASSERT(rule); + LTTNG_ASSERT(writer); + LTTNG_ASSERT(rule->mi_serialize); + + /* Open event rule element. */ + ret = mi_lttng_writer_open_element(writer, mi_lttng_element_event_rule); + if (ret) { + goto mi_error; + } + + /* Serialize underlying event rule. */ + ret_code = rule->mi_serialize(rule, writer); + if (ret_code != LTTNG_OK) { + goto end; + } + + /* Close event rule element. */ + ret = mi_lttng_writer_close_element(writer); + if (ret) { + goto mi_error; + } + + ret_code = LTTNG_OK; + goto end; + +mi_error: + ret_code = LTTNG_ERR_MI_IO_FAIL; +end: + return ret_code; +}