Rename lttng_event_rule_kernel_probe to lttng_event_rule_kernel_kprobe

[lttng-tools.git] / src / bin / lttng / commands / list_triggers.c

diff --git a/src/bin/lttng/commands/list_triggers.c b/src/bin/lttng/commands/list_triggers.c
index 26dc201ec892d435c4214570043581611cd52b76..9c2cf0909ed61bf06d093578d57d1e44cde0e23c 100644 (file)
--- a/src/bin/lttng/commands/list_triggers.c
+++ b/src/bin/lttng/commands/list_triggers.c
@@ -18,8 +18,8 @@
 #include "lttng/condition/event-rule-matches-internal.h"
 /* For lttng_domain_type_str(). */
 #include "lttng/domain-internal.h"
-/* For lttng_event_rule_syscall_emission_site_str() */
-#include "lttng/event-rule/syscall-internal.h"
+/* For lttng_event_rule_kernel_syscall_emission_site_str() */
+#include "lttng/event-rule/kernel-syscall-internal.h"
 #include "../loglevel.h"
 #include <lttng/lttng.h>
 
@@ -294,22 +294,22 @@ void print_event_rule_kernel_probe(const struct lttng_event_rule *event_rule)
        const char *name;
        const struct lttng_kernel_probe_location *location;
 
-       assert(lttng_event_rule_get_type(event_rule) == LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE);
+       assert(lttng_event_rule_get_type(event_rule) == LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE);
 
-       event_rule_status = lttng_event_rule_kernel_probe_get_event_name(event_rule, &name);
+       event_rule_status = lttng_event_rule_kernel_kprobe_get_event_name(event_rule, &name);
        if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
                ERR("Failed to get kprobe event rule's name.");
                goto end;
        }
 
-       event_rule_status = lttng_event_rule_kernel_probe_get_location(
+       event_rule_status = lttng_event_rule_kernel_kprobe_get_location(
                        event_rule, &location);
        if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
                ERR("Failed to get kprobe event rule's location.");
                goto end;
        }
 
-       _MSG("    rule: %s (type: probe, location: ", name);
+       _MSG("    rule: %s (type: kernel:kprobe, location: ", name);
 
        print_kernel_probe_location(location);
 
@@ -327,23 +327,23 @@ void print_event_rule_userspace_probe(const struct lttng_event_rule *event_rule)
        const struct lttng_userspace_probe_location *location;
        enum lttng_userspace_probe_location_type userspace_probe_location_type;
 
-       assert(lttng_event_rule_get_type(event_rule) == LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE);
+       assert(lttng_event_rule_get_type(event_rule) == LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE);
 
-       event_rule_status = lttng_event_rule_userspace_probe_get_event_name(
+       event_rule_status = lttng_event_rule_kernel_uprobe_get_event_name(
                        event_rule, &name);
        if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
                ERR("Failed to get uprobe event rule's name.");
                goto end;
        }
 
-       event_rule_status = lttng_event_rule_userspace_probe_get_location(
+       event_rule_status = lttng_event_rule_kernel_uprobe_get_location(
                        event_rule, &location);
        if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
                ERR("Failed to get uprobe event rule's location.");
                goto end;
        }
 
-       _MSG("    rule: %s (type: userspace probe, ", name);
+       _MSG("    rule: %s (type: kernel:uprobe, ", name);
 
        userspace_probe_location_type =
                        lttng_userspace_probe_location_get_type(location);
@@ -389,22 +389,22 @@ void print_event_rule_syscall(const struct lttng_event_rule *event_rule)
 {
        const char *pattern, *filter;
        enum lttng_event_rule_status event_rule_status;
-       enum lttng_event_rule_syscall_emission_site emission_site;
+       enum lttng_event_rule_kernel_syscall_emission_site emission_site;
 
-       assert(lttng_event_rule_get_type(event_rule) == LTTNG_EVENT_RULE_TYPE_SYSCALL);
+       assert(lttng_event_rule_get_type(event_rule) == LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL);
 
        emission_site =
-               lttng_event_rule_syscall_get_emission_site(event_rule);
+               lttng_event_rule_kernel_syscall_get_emission_site(event_rule);
 
-       event_rule_status = lttng_event_rule_syscall_get_name_pattern(
+       event_rule_status = lttng_event_rule_kernel_syscall_get_name_pattern(
                        event_rule, &pattern);
        assert(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK);
 
-       _MSG("    rule: %s (type: syscall:%s", pattern,
-                       lttng_event_rule_syscall_emission_site_str(
+       _MSG("    rule: %s (type: kernel:syscall:%s", pattern,
+                       lttng_event_rule_kernel_syscall_emission_site_str(
                                        emission_site));
 
-       event_rule_status = lttng_event_rule_syscall_get_filter(
+       event_rule_status = lttng_event_rule_kernel_syscall_get_filter(
                        event_rule, &filter);
        if (event_rule_status == LTTNG_EVENT_RULE_STATUS_OK) {
                _MSG(", filter: %s", filter);
@@ -425,13 +425,13 @@ void print_event_rule(const struct lttng_event_rule *event_rule)
        case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
                print_event_rule_tracepoint(event_rule);
                break;
-       case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
+       case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
                print_event_rule_kernel_probe(event_rule);
                break;
-       case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE:
+       case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
                print_event_rule_userspace_probe(event_rule);
                break;
-       case LTTNG_EVENT_RULE_TYPE_SYSCALL:
+       case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL:
                print_event_rule_syscall(event_rule);
                break;
        default: