From d64ca52172a1d34cab8c2f8fc66e45a275e452ac Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 3 May 2021 10:18:58 -0400 Subject: [PATCH] Rename struct lttng_bytecode_node to struct lttng_kernel_bytecode_node Signed-off-by: Mathieu Desnoyers Change-Id: Ic00142968c7132d3a2b8292d426948dfbe1b0d88 --- include/lttng/events-internal.h | 4 ++-- include/lttng/events.h | 4 ++-- src/lttng-bytecode.c | 12 ++++++------ src/lttng-events.c | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h index 5c1d356b..fa9cc35a 100644 --- a/include/lttng/events-internal.h +++ b/include/lttng/events-internal.h @@ -85,7 +85,7 @@ struct lttng_kernel_bytecode_filter_ctx { struct lttng_enabler { enum lttng_enabler_format_type format_type; - /* head list of struct lttng_bytecode_node */ + /* head list of struct lttng_kernel_bytecode_node */ struct list_head filter_bytecode_head; struct lttng_kernel_abi_event event_param; @@ -106,7 +106,7 @@ struct lttng_event_notifier_enabler { struct list_head node; /* List of event_notifier enablers */ struct lttng_event_notifier_group *group; - /* head list of struct lttng_bytecode_node */ + /* head list of struct lttng_kernel_bytecode_node */ struct list_head capture_bytecode_head; uint64_t num_captures; }; diff --git a/include/lttng/events.h b/include/lttng/events.h index 122ebc96..40f95dcf 100644 --- a/include/lttng/events.h +++ b/include/lttng/events.h @@ -323,7 +323,7 @@ enum lttng_kernel_bytecode_type { LTTNG_KERNEL_BYTECODE_TYPE_CAPTURE, }; -struct lttng_bytecode_node { +struct lttng_kernel_bytecode_node { enum lttng_kernel_bytecode_type type; struct list_head node; struct lttng_enabler *enabler; @@ -340,7 +340,7 @@ struct lttng_interpreter_output; struct lttng_bytecode_runtime { /* Associated bytecode */ enum lttng_kernel_bytecode_type type; - struct lttng_bytecode_node *bc; + struct lttng_kernel_bytecode_node *bc; int (*interpreter_func)(struct lttng_bytecode_runtime *kernel_bytecode, const char *interpreter_stack_data, struct lttng_probe_ctx *lttng_probe_ctx, diff --git a/src/lttng-bytecode.c b/src/lttng-bytecode.c index e1d0afe6..6ccd72c7 100644 --- a/src/lttng-bytecode.c +++ b/src/lttng-bytecode.c @@ -408,7 +408,7 @@ int apply_reloc(const struct lttng_kernel_event_desc *event_desc, } static -int bytecode_is_linked(struct lttng_bytecode_node *bytecode, +int bytecode_is_linked(struct lttng_kernel_bytecode_node *bytecode, struct list_head *bytecode_runtime_head) { struct lttng_bytecode_runtime *bc_runtime; @@ -427,7 +427,7 @@ int bytecode_is_linked(struct lttng_bytecode_node *bytecode, static int link_bytecode(const struct lttng_kernel_event_desc *event_desc, struct lttng_kernel_ctx *ctx, - struct lttng_bytecode_node *bytecode, + struct lttng_kernel_bytecode_node *bytecode, struct list_head *bytecode_runtime_head, struct list_head *insert_loc) { @@ -502,7 +502,7 @@ alloc_error: void lttng_bytecode_sync_state(struct lttng_bytecode_runtime *runtime) { - struct lttng_bytecode_node *bc = runtime->bc; + struct lttng_kernel_bytecode_node *bc = runtime->bc; if (!bc->enabler->enabled || runtime->link_failed) runtime->interpreter_func = lttng_bytecode_interpret_error; @@ -523,7 +523,7 @@ void lttng_enabler_link_bytecode(const struct lttng_kernel_event_desc *event_des struct list_head *instance_bytecode_head, struct list_head *enabler_bytecode_head) { - struct lttng_bytecode_node *enabler_bc; + struct lttng_kernel_bytecode_node *enabler_bc; struct lttng_bytecode_runtime *runtime; WARN_ON_ONCE(!event_desc); @@ -579,7 +579,7 @@ void lttng_enabler_link_bytecode(const struct lttng_kernel_event_desc *event_des * We own the filter_bytecode if we return success. */ int lttng_filter_enabler_attach_bytecode(struct lttng_enabler *enabler, - struct lttng_bytecode_node *filter_bytecode) + struct lttng_kernel_bytecode_node *filter_bytecode) { list_add(&filter_bytecode->node, &enabler->filter_bytecode_head); return 0; @@ -587,7 +587,7 @@ int lttng_filter_enabler_attach_bytecode(struct lttng_enabler *enabler, void lttng_free_enabler_filter_bytecode(struct lttng_enabler *enabler) { - struct lttng_bytecode_node *filter_bytecode, *tmp; + struct lttng_kernel_bytecode_node *filter_bytecode, *tmp; list_for_each_entry_safe(filter_bytecode, tmp, &enabler->filter_bytecode_head, node) { diff --git a/src/lttng-events.c b/src/lttng-events.c index 30b514a8..354a2bc3 100644 --- a/src/lttng-events.c +++ b/src/lttng-events.c @@ -2449,7 +2449,7 @@ static int lttng_enabler_attach_filter_bytecode(struct lttng_enabler *enabler, struct lttng_kernel_abi_filter_bytecode __user *bytecode) { - struct lttng_bytecode_node *bytecode_node; + struct lttng_kernel_bytecode_node *bytecode_node; uint32_t bytecode_len; int ret; @@ -2509,7 +2509,7 @@ int lttng_event_add_callsite(struct lttng_kernel_event_common *event, static void lttng_enabler_destroy(struct lttng_enabler *enabler) { - struct lttng_bytecode_node *filter_node, *tmp_filter_node; + struct lttng_kernel_bytecode_node *filter_node, *tmp_filter_node; /* Destroy filter bytecode */ list_for_each_entry_safe(filter_node, tmp_filter_node, @@ -2604,7 +2604,7 @@ int lttng_event_notifier_enabler_attach_capture_bytecode( struct lttng_event_notifier_enabler *event_notifier_enabler, struct lttng_kernel_abi_capture_bytecode __user *bytecode) { - struct lttng_bytecode_node *bytecode_node; + struct lttng_kernel_bytecode_node *bytecode_node; struct lttng_enabler *enabler = lttng_event_notifier_enabler_as_enabler(event_notifier_enabler); uint32_t bytecode_len; -- 2.34.1