From 85522de5747fee084e2e391678a79918355345da Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 18 May 2021 14:48:37 -0400 Subject: [PATCH] Rename lttng_event_rule_kernel_probe to lttng_event_rule_kernel_kprobe MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The add trigger command now accepts `kernel:kprobe` instead of `kernel- probe`. `kprobe` is still accepted. Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau Change-Id: Ifd6753f337e93ea8eb393b8d686596112292c5bb --- include/Makefile.am | 4 +- include/lttng/event-rule/event-rule.h | 2 +- ...be-internal.h => kernel-kprobe-internal.h} | 14 +-- .../{kernel-probe.h => kernel-kprobe.h} | 22 ++-- include/lttng/lttng.h | 2 +- src/bin/lttng-sessiond/trace-kernel.c | 10 +- src/bin/lttng/commands/add_trigger.c | 14 +-- src/bin/lttng/commands/list_triggers.c | 10 +- src/common/Makefile.am | 2 +- src/common/event-rule/event-rule.c | 12 +- .../{kernel-probe.c => kernel-kprobe.c} | 104 +++++++++--------- .../tools/notification/notification.c | 4 +- .../tools/trigger/test_add_trigger_cli | 6 +- .../tools/trigger/test_list_triggers_cli | 6 +- tests/unit/test_event_rule.c | 12 +- 15 files changed, 112 insertions(+), 112 deletions(-) rename include/lttng/event-rule/{kernel-probe-internal.h => kernel-kprobe-internal.h} (65%) rename include/lttng/event-rule/{kernel-probe.h => kernel-kprobe.h} (73%) rename src/common/event-rule/{kernel-probe.c => kernel-kprobe.c} (70%) diff --git a/include/Makefile.am b/include/Makefile.am index 0ab2888b2..6b0343a62 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -152,7 +152,7 @@ lttngtriggerinclude_HEADERS= \ lttngeventruleinclude_HEADERS= \ lttng/event-rule/event-rule.h \ - lttng/event-rule/kernel-probe.h \ + lttng/event-rule/kernel-kprobe.h \ lttng/event-rule/kernel-syscall.h \ lttng/event-rule/kernel-uprobe.h \ lttng/event-rule/tracepoint.h @@ -181,7 +181,7 @@ noinst_HEADERS = \ lttng/event-field-value-internal.h \ lttng/event-internal.h \ lttng/event-rule/event-rule-internal.h \ - lttng/event-rule/kernel-probe-internal.h \ + lttng/event-rule/kernel-kprobe-internal.h \ lttng/event-rule/kernel-syscall-internal.h \ lttng/event-rule/tracepoint-internal.h \ lttng/event-rule/kernel-uprobe-internal.h \ diff --git a/include/lttng/event-rule/event-rule.h b/include/lttng/event-rule/event-rule.h index 1fea37b47..df2056b35 100644 --- a/include/lttng/event-rule/event-rule.h +++ b/include/lttng/event-rule/event-rule.h @@ -18,7 +18,7 @@ enum lttng_event_rule_type { LTTNG_EVENT_RULE_TYPE_UNKNOWN = -1, LTTNG_EVENT_RULE_TYPE_TRACEPOINT = 0, LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL = 1, - LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE = 2, + LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE = 2, LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION = 3, LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE = 4, }; diff --git a/include/lttng/event-rule/kernel-probe-internal.h b/include/lttng/event-rule/kernel-kprobe-internal.h similarity index 65% rename from include/lttng/event-rule/kernel-probe-internal.h rename to include/lttng/event-rule/kernel-kprobe-internal.h index 50c02d851..b6e40b3e2 100644 --- a/include/lttng/event-rule/kernel-probe-internal.h +++ b/include/lttng/event-rule/kernel-kprobe-internal.h @@ -5,21 +5,21 @@ * */ -#ifndef LTTNG_EVENT_RULE_KERNEL_PROBE_INTERNAL_H -#define LTTNG_EVENT_RULE_KERNEL_PROBE_INTERNAL_H +#ifndef LTTNG_EVENT_RULE_KERNEL_KPROBE_INTERNAL_H +#define LTTNG_EVENT_RULE_KERNEL_KPROBE_INTERNAL_H #include #include #include -#include +#include -struct lttng_event_rule_kernel_probe { +struct lttng_event_rule_kernel_kprobe { struct lttng_event_rule parent; char *name; struct lttng_kernel_probe_location *location; }; -struct lttng_event_rule_kernel_probe_comm { +struct lttng_event_rule_kernel_kprobe_comm { /* Includes terminator `\0`. */ uint32_t name_len; uint32_t location_len; @@ -32,8 +32,8 @@ struct lttng_event_rule_kernel_probe_comm { } LTTNG_PACKED; LTTNG_HIDDEN -ssize_t lttng_event_rule_kernel_probe_create_from_payload( +ssize_t lttng_event_rule_kernel_kprobe_create_from_payload( struct lttng_payload_view *payload, struct lttng_event_rule **rule); -#endif /* LTTNG_EVENT_RULE_KERNEL_PROBE_INTERNAL_H */ +#endif /* LTTNG_EVENT_RULE_KERNEL_KPROBE_INTERNAL_H */ diff --git a/include/lttng/event-rule/kernel-probe.h b/include/lttng/event-rule/kernel-kprobe.h similarity index 73% rename from include/lttng/event-rule/kernel-probe.h rename to include/lttng/event-rule/kernel-kprobe.h index e9272ff63..95f0002a3 100644 --- a/include/lttng/event-rule/kernel-probe.h +++ b/include/lttng/event-rule/kernel-kprobe.h @@ -5,8 +5,8 @@ * */ -#ifndef LTTNG_EVENT_RULE_KERNEL_PROBE_H -#define LTTNG_EVENT_RULE_KERNEL_PROBE_H +#ifndef LTTNG_EVENT_RULE_KERNEL_KPROBE_H +#define LTTNG_EVENT_RULE_KERNEL_KPROBE_H #include @@ -17,18 +17,18 @@ extern "C" { struct lttng_kernel_probe_location; /* - * Create a newly allocated kernel probe event rule. + * Create a newly allocated kernel kprobe event rule. * * The location is copied internally. * * Returns a new event rule on success, NULL on failure. The returned event rule * must be destroyed using lttng_event_rule_destroy(). */ -extern struct lttng_event_rule *lttng_event_rule_kernel_probe_create( +extern struct lttng_event_rule *lttng_event_rule_kernel_kprobe_create( const struct lttng_kernel_probe_location *location); /* - * Get the kernel probe location of a kernel probe event rule. + * Get the kernel probe location of a kernel kprobe event rule. * * The caller does not assume the ownership of the returned location. * The location shall only be used for the duration of the event @@ -39,23 +39,23 @@ extern struct lttng_event_rule *lttng_event_rule_kernel_probe_create( * passed, or LTTNG_EVENT_RULE_STATUS_UNSET if a location was not set prior to * this call. */ -extern enum lttng_event_rule_status lttng_event_rule_kernel_probe_get_location( +extern enum lttng_event_rule_status lttng_event_rule_kernel_kprobe_get_location( const struct lttng_event_rule *rule, const struct lttng_kernel_probe_location **location); /* - * Set the name of a kernel probe event rule. + * Set the name of a kernel kprobe event rule. * * The name is copied internally. * * Returns LTTNG_EVENT_RULE_STATUS_OK on success, LTTNG_EVENT_RULE_STATUS_INVALID * if invalid parameters are passed. */ -extern enum lttng_event_rule_status lttng_event_rule_kernel_probe_set_event_name( +extern enum lttng_event_rule_status lttng_event_rule_kernel_kprobe_set_event_name( struct lttng_event_rule *rule, const char *name); /* - * Get the name of a kernel probe event rule. + * Get the name of a kernel kprobe event rule. * * The caller does not assume the ownership of the returned name. * The name shall only only be used for the duration of the event @@ -65,11 +65,11 @@ extern enum lttng_event_rule_status lttng_event_rule_kernel_probe_set_event_name * success, LTTNG_EVENT_RULE_STATUS_INVALID if an invalid parameter is passed, * or LTTNG_EVENT_RULE_STATUS_UNSET if a name was not set prior to this call. */ -extern enum lttng_event_rule_status lttng_event_rule_kernel_probe_get_event_name( +extern enum lttng_event_rule_status lttng_event_rule_kernel_kprobe_get_event_name( const struct lttng_event_rule *rule, const char **name); #ifdef __cplusplus } #endif -#endif /* LTTNG_EVENT_RULE_KERNEL_PROBE_H */ +#endif /* LTTNG_EVENT_RULE_KERNEL_KPROBE_H */ diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h index 1fa904b4d..dc09f2037 100644 --- a/include/lttng/lttng.h +++ b/include/lttng/lttng.h @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c index 0ab1b6864..952342e54 100644 --- a/src/bin/lttng-sessiond/trace-kernel.c +++ b/src/bin/lttng-sessiond/trace-kernel.c @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -552,7 +552,7 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule( int strncpy_ret; switch (lttng_event_rule_get_type(rule)) { - case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE: { uint64_t address = 0, offset = 0; const char *symbol_name = NULL; @@ -560,7 +560,7 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule( enum lttng_kernel_probe_location_status k_status; enum lttng_event_rule_status status; - status = lttng_event_rule_kernel_probe_get_location(rule, &location); + status = lttng_event_rule_kernel_kprobe_get_location(rule, &location); if (status != LTTNG_EVENT_RULE_STATUS_OK) { ret_code = LTTNG_ERR_PROBE_LOCATION_INVAL; goto error; @@ -603,7 +603,7 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule( kernel_event_notifier->event.u.kprobe.symbol_name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0'; - status = lttng_event_rule_kernel_probe_get_event_name(rule, &name); + status = lttng_event_rule_kernel_kprobe_get_event_name(rule, &name); assert(status == LTTNG_EVENT_RULE_STATUS_OK); ret_code = LTTNG_OK; break; diff --git a/src/bin/lttng/commands/add_trigger.c b/src/bin/lttng/commands/add_trigger.c index 0f94ef155..8b0754bd2 100644 --- a/src/bin/lttng/commands/add_trigger.c +++ b/src/bin/lttng/commands/add_trigger.c @@ -128,8 +128,8 @@ bool assign_event_rule_type(enum lttng_event_rule_type *dest, const char *arg) if (strcmp(arg, "tracepoint") == 0 || strcmp(arg, "logging") == 0) { *dest = LTTNG_EVENT_RULE_TYPE_TRACEPOINT; } else if (strcmp(arg, "kprobe") == 0 || - strcmp(arg, "kernel-probe") == 0) { - *dest = LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE; + strcmp(arg, "kernel:kprobe") == 0) { + *dest = LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE; } else if (strcmp(arg, "kernel:uprobe") == 0) { *dest = LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE; } else if (strcmp(arg, "function") == 0) { @@ -885,7 +885,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) * If omitted, it defaults to the location. */ switch (event_rule_type) { - case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE: case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE: case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION: if (!location) { @@ -931,7 +931,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_KERNEL_KPROBE: case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION: case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE: case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL: @@ -1089,7 +1089,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) break; } - case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE: { int ret; enum lttng_event_rule_status event_rule_status; @@ -1102,14 +1102,14 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) } assert(kernel_probe_location); - res.er = lttng_event_rule_kernel_probe_create(kernel_probe_location); + res.er = lttng_event_rule_kernel_kprobe_create(kernel_probe_location); if (!res.er) { ERR("Failed to create kprobe event rule."); goto error; } event_rule_status = - lttng_event_rule_kernel_probe_set_event_name( + lttng_event_rule_kernel_kprobe_set_event_name( res.er, event_name); if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) { ERR("Failed to set kprobe event rule's name to '%s'.", diff --git a/src/bin/lttng/commands/list_triggers.c b/src/bin/lttng/commands/list_triggers.c index e10fc29f1..9c2cf0909 100644 --- a/src/bin/lttng/commands/list_triggers.c +++ b/src/bin/lttng/commands/list_triggers.c @@ -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); @@ -425,7 +425,7 @@ 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_KERNEL_UPROBE: diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 296d49551..12a6ba807 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -65,7 +65,7 @@ libcommon_la_SOURCES = \ event-expr-to-bytecode.c event-expr-to-bytecode.h \ event-field-value.c \ event-rule/event-rule.c \ - event-rule/kernel-probe.c \ + event-rule/kernel-kprobe.c \ event-rule/kernel-syscall.c \ event-rule/kernel-uprobe.c \ event-rule/tracepoint.c \ diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c index 291ef533c..33e91cdfb 100644 --- a/src/common/event-rule/event-rule.c +++ b/src/common/event-rule/event-rule.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -41,7 +41,7 @@ enum lttng_domain_type lttng_event_rule_get_domain_type( break; } case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL: - case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE: case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION: case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE: domain_type = LTTNG_DOMAIN_KERNEL; @@ -172,8 +172,8 @@ ssize_t lttng_event_rule_create_from_payload( create_from_payload = lttng_event_rule_tracepoint_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_KPROBE: + create_from_payload = lttng_event_rule_kernel_kprobe_create_from_payload; break; case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION: /* TODO */ @@ -315,8 +315,8 @@ const char *lttng_event_rule_type_str(enum lttng_event_rule_type type) return "tracepoint"; case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL: return "kernel syscall"; - case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE: - return "probe"; + 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: diff --git a/src/common/event-rule/kernel-probe.c b/src/common/event-rule/kernel-kprobe.c similarity index 70% rename from src/common/event-rule/kernel-probe.c rename to src/common/event-rule/kernel-kprobe.c index f53e9245b..b069bdb31 100644 --- a/src/common/event-rule/kernel-probe.c +++ b/src/common/event-rule/kernel-kprobe.c @@ -18,40 +18,40 @@ #include #include #include -#include +#include #include #include #include #define IS_KPROBE_EVENT_RULE(rule) \ - (lttng_event_rule_get_type(rule) == LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE) + (lttng_event_rule_get_type(rule) == LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE) #if (LTTNG_SYMBOL_NAME_LEN == 256) #define LTTNG_SYMBOL_NAME_LEN_SCANF_IS_A_BROKEN_API "255" #endif -static void lttng_event_rule_kernel_probe_destroy(struct lttng_event_rule *rule) +static void lttng_event_rule_kernel_kprobe_destroy(struct lttng_event_rule *rule) { - struct lttng_event_rule_kernel_probe *kprobe; + struct lttng_event_rule_kernel_kprobe *kprobe; - kprobe = container_of(rule, struct lttng_event_rule_kernel_probe, parent); + kprobe = container_of(rule, struct lttng_event_rule_kernel_kprobe, parent); lttng_kernel_probe_location_destroy(kprobe->location); free(kprobe->name); free(kprobe); } -static bool lttng_event_rule_kernel_probe_validate( +static bool lttng_event_rule_kernel_kprobe_validate( const struct lttng_event_rule *rule) { bool valid = false; - struct lttng_event_rule_kernel_probe *kprobe; + struct lttng_event_rule_kernel_kprobe *kprobe; if (!rule) { goto end; } - kprobe = container_of(rule, struct lttng_event_rule_kernel_probe, parent); + kprobe = container_of(rule, struct lttng_event_rule_kernel_kprobe, parent); /* Required field. */ if (!kprobe->name) { @@ -70,15 +70,15 @@ end: return valid; } -static int lttng_event_rule_kernel_probe_serialize( +static int lttng_event_rule_kernel_kprobe_serialize( const struct lttng_event_rule *rule, struct lttng_payload *payload) { int ret; size_t name_len, header_offset, size_before_location; - struct lttng_event_rule_kernel_probe *kprobe; - struct lttng_event_rule_kernel_probe_comm kprobe_comm; - struct lttng_event_rule_kernel_probe_comm *header; + struct lttng_event_rule_kernel_kprobe *kprobe; + struct lttng_event_rule_kernel_kprobe_comm kprobe_comm; + struct lttng_event_rule_kernel_kprobe_comm *header; if (!rule || !IS_KPROBE_EVENT_RULE(rule)) { ret = -1; @@ -88,7 +88,7 @@ static int lttng_event_rule_kernel_probe_serialize( header_offset = payload->buffer.size; DBG("Serializing kprobe event rule."); - kprobe = container_of(rule, struct lttng_event_rule_kernel_probe, parent); + kprobe = container_of(rule, struct lttng_event_rule_kernel_kprobe, parent); name_len = strlen(kprobe->name) + 1; kprobe_comm.name_len = name_len; @@ -112,7 +112,7 @@ static int lttng_event_rule_kernel_probe_serialize( } /* Update the header regarding the probe size. */ - header = (struct lttng_event_rule_kernel_probe_comm*) ( + header = (struct lttng_event_rule_kernel_kprobe_comm*) ( (char *) payload->buffer.data + header_offset); header->location_len = payload->buffer.size - size_before_location; @@ -122,14 +122,14 @@ end: return ret; } -static bool lttng_event_rule_kernel_probe_is_equal(const struct lttng_event_rule *_a, +static bool lttng_event_rule_kernel_kprobe_is_equal(const struct lttng_event_rule *_a, const struct lttng_event_rule *_b) { bool is_equal = false; - struct lttng_event_rule_kernel_probe *a, *b; + struct lttng_event_rule_kernel_kprobe *a, *b; - a = container_of(_a, struct lttng_event_rule_kernel_probe, parent); - b = container_of(_b, struct lttng_event_rule_kernel_probe, parent); + a = container_of(_a, struct lttng_event_rule_kernel_kprobe, parent); + b = container_of(_b, struct lttng_event_rule_kernel_kprobe, parent); /* Quick checks */ if (!!a->name != !!b->name) { @@ -149,7 +149,7 @@ end: return is_equal; } -static enum lttng_error_code lttng_event_rule_kernel_probe_generate_filter_bytecode( +static enum lttng_error_code lttng_event_rule_kernel_kprobe_generate_filter_bytecode( struct lttng_event_rule *rule, const struct lttng_credentials *creds) { @@ -157,7 +157,7 @@ static enum lttng_error_code lttng_event_rule_kernel_probe_generate_filter_bytec return LTTNG_OK; } -static const char *lttng_event_rule_kernel_probe_get_filter( +static const char *lttng_event_rule_kernel_kprobe_get_filter( const struct lttng_event_rule *rule) { /* Not supported. */ @@ -165,14 +165,14 @@ static const char *lttng_event_rule_kernel_probe_get_filter( } static const struct lttng_bytecode * -lttng_event_rule_kernel_probe_get_filter_bytecode(const struct lttng_event_rule *rule) +lttng_event_rule_kernel_kprobe_get_filter_bytecode(const struct lttng_event_rule *rule) { /* Not supported. */ return NULL; } static enum lttng_event_rule_generate_exclusions_status -lttng_event_rule_kernel_probe_generate_exclusions(const struct lttng_event_rule *rule, +lttng_event_rule_kernel_kprobe_generate_exclusions(const struct lttng_event_rule *rule, struct lttng_event_exclusion **exclusions) { /* Not supported. */ @@ -181,14 +181,14 @@ lttng_event_rule_kernel_probe_generate_exclusions(const struct lttng_event_rule } static unsigned long -lttng_event_rule_kernel_probe_hash( +lttng_event_rule_kernel_kprobe_hash( const struct lttng_event_rule *rule) { unsigned long hash; - struct lttng_event_rule_kernel_probe *krule = + struct lttng_event_rule_kernel_kprobe *krule = container_of(rule, typeof(*krule), parent); - hash = hash_key_ulong((void *) LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE, + hash = hash_key_ulong((void *) LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE, lttng_ht_seed); hash ^= hash_key_str(krule->name, lttng_ht_seed); hash ^= lttng_kernel_probe_location_hash(krule->location); @@ -198,7 +198,7 @@ lttng_event_rule_kernel_probe_hash( static int kernel_probe_set_location( - struct lttng_event_rule_kernel_probe *kprobe, + struct lttng_event_rule_kernel_kprobe *kprobe, const struct lttng_kernel_probe_location *location) { int ret; @@ -223,31 +223,31 @@ end: return ret; } -struct lttng_event_rule *lttng_event_rule_kernel_probe_create( +struct lttng_event_rule *lttng_event_rule_kernel_kprobe_create( const struct lttng_kernel_probe_location *location) { struct lttng_event_rule *rule = NULL; - struct lttng_event_rule_kernel_probe *krule; + struct lttng_event_rule_kernel_kprobe *krule; - krule = zmalloc(sizeof(struct lttng_event_rule_kernel_probe)); + krule = zmalloc(sizeof(struct lttng_event_rule_kernel_kprobe)); if (!krule) { goto end; } rule = &krule->parent; - lttng_event_rule_init(&krule->parent, LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE); - krule->parent.validate = lttng_event_rule_kernel_probe_validate; - krule->parent.serialize = lttng_event_rule_kernel_probe_serialize; - krule->parent.equal = lttng_event_rule_kernel_probe_is_equal; - krule->parent.destroy = lttng_event_rule_kernel_probe_destroy; + lttng_event_rule_init(&krule->parent, LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE); + krule->parent.validate = lttng_event_rule_kernel_kprobe_validate; + krule->parent.serialize = lttng_event_rule_kernel_kprobe_serialize; + krule->parent.equal = lttng_event_rule_kernel_kprobe_is_equal; + krule->parent.destroy = lttng_event_rule_kernel_kprobe_destroy; krule->parent.generate_filter_bytecode = - lttng_event_rule_kernel_probe_generate_filter_bytecode; - krule->parent.get_filter = lttng_event_rule_kernel_probe_get_filter; + lttng_event_rule_kernel_kprobe_generate_filter_bytecode; + krule->parent.get_filter = lttng_event_rule_kernel_kprobe_get_filter; krule->parent.get_filter_bytecode = - lttng_event_rule_kernel_probe_get_filter_bytecode; + lttng_event_rule_kernel_kprobe_get_filter_bytecode; krule->parent.generate_exclusions = - lttng_event_rule_kernel_probe_generate_exclusions; - krule->parent.hash = lttng_event_rule_kernel_probe_hash; + lttng_event_rule_kernel_kprobe_generate_exclusions; + krule->parent.hash = lttng_event_rule_kernel_kprobe_hash; if (kernel_probe_set_location(krule, location)) { lttng_event_rule_destroy(rule); @@ -259,13 +259,13 @@ end: } LTTNG_HIDDEN -ssize_t lttng_event_rule_kernel_probe_create_from_payload( +ssize_t lttng_event_rule_kernel_kprobe_create_from_payload( struct lttng_payload_view *view, struct lttng_event_rule **_event_rule) { ssize_t ret, offset = 0; enum lttng_event_rule_status status; - const struct lttng_event_rule_kernel_probe_comm *kprobe_comm; + const struct lttng_event_rule_kernel_kprobe_comm *kprobe_comm; const char *name; struct lttng_buffer_view current_buffer_view; struct lttng_event_rule *rule = NULL; @@ -339,14 +339,14 @@ ssize_t lttng_event_rule_kernel_probe_create_from_payload( /* Skip after the location */ offset += kprobe_comm->location_len; - rule = lttng_event_rule_kernel_probe_create(location); + rule = lttng_event_rule_kernel_kprobe_create(location); if (!rule) { ERR("Failed to create event rule kprobe."); ret = -1; goto end; } - status = lttng_event_rule_kernel_probe_set_event_name(rule, name); + status = lttng_event_rule_kernel_kprobe_set_event_name(rule, name); if (status != LTTNG_EVENT_RULE_STATUS_OK) { ERR("Failed to set event rule kprobe name."); ret = -1; @@ -362,19 +362,19 @@ end: return ret; } -enum lttng_event_rule_status lttng_event_rule_kernel_probe_get_location( +enum lttng_event_rule_status lttng_event_rule_kernel_kprobe_get_location( const struct lttng_event_rule *rule, const struct lttng_kernel_probe_location **location) { enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; - struct lttng_event_rule_kernel_probe *kprobe; + struct lttng_event_rule_kernel_kprobe *kprobe; if (!rule || !IS_KPROBE_EVENT_RULE(rule) || !location) { status = LTTNG_EVENT_RULE_STATUS_INVALID; goto end; } - kprobe = container_of(rule, struct lttng_event_rule_kernel_probe, parent); + kprobe = container_of(rule, struct lttng_event_rule_kernel_kprobe, parent); *location = kprobe->location; if (!*location) { @@ -386,11 +386,11 @@ end: return status; } -enum lttng_event_rule_status lttng_event_rule_kernel_probe_set_event_name( +enum lttng_event_rule_status lttng_event_rule_kernel_kprobe_set_event_name( struct lttng_event_rule *rule, const char *name) { char *name_copy = NULL; - struct lttng_event_rule_kernel_probe *kprobe; + struct lttng_event_rule_kernel_kprobe *kprobe; enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; if (!rule || !IS_KPROBE_EVENT_RULE(rule) || !name || @@ -399,7 +399,7 @@ enum lttng_event_rule_status lttng_event_rule_kernel_probe_set_event_name( goto end; } - kprobe = container_of(rule, struct lttng_event_rule_kernel_probe, parent); + kprobe = container_of(rule, struct lttng_event_rule_kernel_kprobe, parent); name_copy = strdup(name); if (!name_copy) { status = LTTNG_EVENT_RULE_STATUS_ERROR; @@ -414,10 +414,10 @@ end: return status; } -enum lttng_event_rule_status lttng_event_rule_kernel_probe_get_event_name( +enum lttng_event_rule_status lttng_event_rule_kernel_kprobe_get_event_name( const struct lttng_event_rule *rule, const char **name) { - struct lttng_event_rule_kernel_probe *kprobe; + struct lttng_event_rule_kernel_kprobe *kprobe; enum lttng_event_rule_status status = LTTNG_EVENT_RULE_STATUS_OK; if (!rule || !IS_KPROBE_EVENT_RULE(rule) || !name) { @@ -425,7 +425,7 @@ enum lttng_event_rule_status lttng_event_rule_kernel_probe_get_event_name( goto end; } - kprobe = container_of(rule, struct lttng_event_rule_kernel_probe, parent); + kprobe = container_of(rule, struct lttng_event_rule_kernel_kprobe, parent); if (!kprobe->name) { status = LTTNG_EVENT_RULE_STATUS_UNSET; goto end; diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c index aa42d5ef2..1b657663c 100644 --- a/tests/regression/tools/notification/notification.c +++ b/tests/regression/tools/notification/notification.c @@ -1861,10 +1861,10 @@ static void test_kprobe_event_rule_notification( lttng_session_daemon_notification_endpoint); ok(notification_channel, "Notification channel object creation"); - event_rule = lttng_event_rule_kernel_probe_create(location); + event_rule = lttng_event_rule_kernel_kprobe_create(location); ok(event_rule, "kprobe event rule object creation"); - event_rule_status = lttng_event_rule_kernel_probe_set_event_name( + event_rule_status = lttng_event_rule_kernel_kprobe_set_event_name( event_rule, trigger_name); ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK, "Setting kprobe event rule name: '%s'", trigger_name); diff --git a/tests/regression/tools/trigger/test_add_trigger_cli b/tests/regression/tools/trigger/test_add_trigger_cli index bbb34b51f..01859ee74 100755 --- a/tests/regression/tools/trigger/test_add_trigger_cli +++ b/tests/regression/tools/trigger/test_add_trigger_cli @@ -147,7 +147,7 @@ test_success "--exclude-name two" \ --action notify skip $ist_root "non-root user: skipping kprobe tests" 18 || { - for type in kprobe kernel-probe; do + for type in kprobe kernel:kprobe; do test_success "--condition event-rule-matches probe by symbol" \ --condition event-rule-matches --domain=kernel --type=$type --location=lttng_channel_enable --event-name=my_channel_enable \ --action notify @@ -364,9 +364,9 @@ test_failure "two different --domain" \ "Error: More than one \`--domain\` was specified." \ --condition event-rule-matches --domain=user --domain=kernel -for type in kprobe kernel-probe; do +for type in kprobe kernel:kprobe; do test_failure "--condition event-rule-matches: --name with --type=$type" \ - "Error: Can't use --name with probe event rules." \ + "Error: Can't use --name with kernel kprobe event rules." \ --condition event-rule-matches --type=$type --location=do_sys_open --name='hello' done diff --git a/tests/regression/tools/trigger/test_list_triggers_cli b/tests/regression/tools/trigger/test_list_triggers_cli index a36393f13..5366a030c 100755 --- a/tests/regression/tools/trigger/test_list_triggers_cli +++ b/tests/regression/tools/trigger/test_list_triggers_cli @@ -225,7 +225,7 @@ test_event_rule_matches_probe () - name: T0 owner uid: ${uid} condition: event rule matches - rule: my_channel_enable (type: probe, location: lttng_channel_enable) + rule: my_channel_enable (type: kernel:kprobe, location: lttng_channel_enable) actions: notify errors: none @@ -233,7 +233,7 @@ test_event_rule_matches_probe () - name: T1 owner uid: ${uid} condition: event rule matches - rule: my_channel_enable (type: probe, location: ${base_symbol}+${offset_hex}) + rule: my_channel_enable (type: kernel:kprobe, location: ${base_symbol}+${offset_hex}) actions: notify errors: none @@ -241,7 +241,7 @@ test_event_rule_matches_probe () - name: T2 owner uid: ${uid} condition: event rule matches - rule: my_channel_enable (type: probe, location: 0x${channel_enable_addr}) + rule: my_channel_enable (type: kernel:kprobe, location: 0x${channel_enable_addr}) actions: notify errors: none diff --git a/tests/unit/test_event_rule.c b/tests/unit/test_event_rule.c index 091f53aba..8d2ffe35f 100644 --- a/tests/unit/test_event_rule.c +++ b/tests/unit/test_event_rule.c @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -313,18 +313,18 @@ static void test_event_rule_kernel_probe_by_location( lttng_payload_init(&payload); - kprobe = lttng_event_rule_kernel_probe_create(location); + kprobe = lttng_event_rule_kernel_kprobe_create(location); ok(kprobe, "kprobe event rule object creation."); - status = lttng_event_rule_kernel_probe_get_location(kprobe, &_location); + status = lttng_event_rule_kernel_kprobe_get_location(kprobe, &_location); ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting kprobe event rule location."); ok(lttng_kernel_probe_location_is_equal(location, _location), "Locations are equal."); - status = lttng_event_rule_kernel_probe_set_event_name(kprobe, probe_name); + status = lttng_event_rule_kernel_kprobe_set_event_name(kprobe, probe_name); ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Setting kprobe event rule name: %s.", probe_name); - status = lttng_event_rule_kernel_probe_get_event_name(kprobe, &tmp); + status = lttng_event_rule_kernel_kprobe_get_event_name(kprobe, &tmp); ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting kprobe name."); ok(!strcmp(probe_name, tmp), "kprobe name are equal."); -- 2.34.1