Rename event rule kretprobe to kernel function

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ibbd0cfa74e7d8e5b922debd23fc5f89cdeb14621

diff --git a/include/lttng/event-rule/event-rule.h b/include/lttng/event-rule/event-rule.h
index df9e9b2d208b963a1d2ed537e982257ac88034f0..eec673e007f579b140fcee2899e8be4301a6193b 100644 (file)
--- 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 9c2f61ad7f2232fd7190e5df37ffc5a60f36118e..11548884d143174241afa67adfebe359f2c89e19 100644 (file)
--- 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 f1b505f25ffb0adcd769684c0d216dea37f401af..ef5b167c535c8667f565525c2f55751bd6d933bc 100644 (file)
--- 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 dfb8febfe49dd78c3c0d40e29d5d598d73e3980e..841e182b37fbf7bc69c46db391759a6e6730d056 100644 (file)
--- 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";