From f2d09181d82a6b19908e15c3264be52c0c08c3b8 Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Tue, 16 Mar 2021 14:28:08 -0400 Subject: [PATCH] Rename event rule kretprobe to kernel function MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Francis Deslauriers Signed-off-by: Jérémie Galarneau Change-Id: Ibbd0cfa74e7d8e5b922debd23fc5f89cdeb14621 --- include/lttng/event-rule/event-rule.h | 2 +- src/bin/lttng-sessiond/trace-kernel.c | 2 +- src/bin/lttng/commands/add_trigger.c | 4 ++-- src/common/event-rule/event-rule.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/lttng/event-rule/event-rule.h b/include/lttng/event-rule/event-rule.h index df9e9b2d2..eec673e00 100644 --- a/include/lttng/event-rule/event-rule.h +++ b/include/lttng/event-rule/event-rule.h @@ -19,7 +19,7 @@ enum lttng_event_rule_type { LTTNG_EVENT_RULE_TYPE_TRACEPOINT = 0, LTTNG_EVENT_RULE_TYPE_SYSCALL = 1, LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE = 2, - LTTNG_EVENT_RULE_TYPE_KRETPROBE = 3, + LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION = 3, LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE = 4, }; diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c index 9c2f61ad7..11548884d 100644 --- a/src/bin/lttng-sessiond/trace-kernel.c +++ b/src/bin/lttng-sessiond/trace-kernel.c @@ -688,7 +688,7 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule( ret_code = LTTNG_OK; break; } - case LTTNG_EVENT_RULE_TYPE_KRETPROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION: default: abort(); break; diff --git a/src/bin/lttng/commands/add_trigger.c b/src/bin/lttng/commands/add_trigger.c index f1b505f25..ef5b167c5 100644 --- a/src/bin/lttng/commands/add_trigger.c +++ b/src/bin/lttng/commands/add_trigger.c @@ -628,7 +628,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) /* Event rule types */ case OPT_FUNCTION: if (!assign_event_rule_type(&event_rule_type, - LTTNG_EVENT_RULE_TYPE_KRETPROBE)) { + LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION)) { goto error; } @@ -819,7 +819,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) /* Validate event rule type against domain. */ switch (event_rule_type) { case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE: - case LTTNG_EVENT_RULE_TYPE_KRETPROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION: case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE: case LTTNG_EVENT_RULE_TYPE_SYSCALL: if (domain_type != LTTNG_DOMAIN_KERNEL) { diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c index dfb8febfe..841e182b3 100644 --- a/src/common/event-rule/event-rule.c +++ b/src/common/event-rule/event-rule.c @@ -42,7 +42,7 @@ enum lttng_domain_type lttng_event_rule_get_domain_type( } case LTTNG_EVENT_RULE_TYPE_SYSCALL: case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE: - case LTTNG_EVENT_RULE_TYPE_KRETPROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION: case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE: domain_type = LTTNG_DOMAIN_KERNEL; break; @@ -175,7 +175,7 @@ ssize_t lttng_event_rule_create_from_payload( case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE: create_from_payload = lttng_event_rule_kernel_probe_create_from_payload; break; - case LTTNG_EVENT_RULE_TYPE_KRETPROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION: /* TODO */ break; case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE: @@ -317,7 +317,7 @@ const char *lttng_event_rule_type_str(enum lttng_event_rule_type type) return "syscall"; case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE: return "probe"; - case LTTNG_EVENT_RULE_TYPE_KRETPROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION: return "function"; case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE: return "userspace-probe"; -- 2.34.1