From 49aea3ef02a8850558d7e2e748435c96619c27a4 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 24 Nov 2023 16:07:40 -0500 Subject: [PATCH] Rename side state "p" field to "parent" Signed-off-by: Mathieu Desnoyers --- include/side/instrumentation-c-api.h | 8 ++++---- include/side/trace.h | 2 +- src/side.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/side/instrumentation-c-api.h b/include/side/instrumentation-c-api.h index 5b7b40c..be61d6c 100644 --- a/include/side/instrumentation-c-api.h +++ b/include/side/instrumentation-c-api.h @@ -1127,7 +1127,7 @@ .sav = SIDE_PTR_INIT(side_sav), \ .len = SIDE_ARRAY_SIZE(side_sav), \ }; \ - side_call(&(side_event_state__##_identifier).p, &side_arg_vec); \ + side_call(&(side_event_state__##_identifier).parent, &side_arg_vec); \ } #define side_event(_identifier, _sav) \ @@ -1148,7 +1148,7 @@ .len = SIDE_ARRAY_SIZE(side_fields), \ .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \ }; \ - side_call_variadic(&(side_event_state__##_identifier.p), &side_arg_vec, &var_struct); \ + side_call_variadic(&(side_event_state__##_identifier.parent), &side_arg_vec, &var_struct); \ } #define side_event_variadic(_identifier, _sav, _var, _attr...) \ @@ -1160,7 +1160,7 @@ _identifier; \ _linkage struct side_event_state_0 __attribute__((section("side_event_state"))) \ side_event_state__##_identifier = { \ - .p = { \ + .parent = { \ .version = SIDE_EVENT_STATE_ABI_VERSION, \ }, \ .nr_callbacks = 0, \ @@ -1172,7 +1172,7 @@ _identifier = { \ .struct_size = offsetof(struct side_event_description, end), \ .version = SIDE_EVENT_DESCRIPTION_ABI_VERSION, \ - .state = SIDE_PTR_INIT(&(side_event_state__##_identifier.p)), \ + .state = SIDE_PTR_INIT(&(side_event_state__##_identifier.parent)), \ .provider_name = SIDE_PTR_INIT(_provider), \ .event_name = SIDE_PTR_INIT(_event), \ .fields = SIDE_PTR_INIT(_fields), \ diff --git a/include/side/trace.h b/include/side/trace.h index d13432b..2e21171 100644 --- a/include/side/trace.h +++ b/include/side/trace.h @@ -61,7 +61,7 @@ struct side_event_state { }; struct side_event_state_0 { - struct side_event_state p; /* Required first field. */ + struct side_event_state parent; /* Required first field. */ uint32_t nr_callbacks; uintptr_t enabled; const struct side_callback *callbacks; diff --git a/src/side.c b/src/side.c index e338006..bcce608 100644 --- a/src/side.c +++ b/src/side.c @@ -76,7 +76,7 @@ void side_call(const struct side_event_state *event_state, const struct side_arg side_init(); if (side_unlikely(event_state->version != 0)) abort(); - es0 = side_container_of(event_state, const struct side_event_state_0, p); + es0 = side_container_of(event_state, const struct side_event_state_0, parent); assert(!(es0->desc->flags & SIDE_EVENT_FLAG_VARIADIC)); enabled = __atomic_load_n(&es0->enabled, __ATOMIC_RELAXED); if (side_unlikely(enabled & SIDE_EVENT_ENABLED_KERNEL_USER_EVENT_MASK)) { @@ -103,7 +103,7 @@ void side_call_variadic(const struct side_event_state *event_state, side_init(); if (side_unlikely(event_state->version != 0)) abort(); - es0 = side_container_of(event_state, const struct side_event_state_0, p); + es0 = side_container_of(event_state, const struct side_event_state_0, parent); assert(es0->desc->flags & SIDE_EVENT_FLAG_VARIADIC); enabled = __atomic_load_n(&es0->enabled, __ATOMIC_RELAXED); if (side_unlikely(enabled & SIDE_EVENT_ENABLED_KERNEL_USER_EVENT_MASK)) { @@ -126,7 +126,7 @@ const struct side_callback *side_tracer_callback_lookup( if (side_unlikely(event_state->version != 0)) abort(); - es0 = side_container_of(event_state, const struct side_event_state_0, p); + es0 = side_container_of(event_state, const struct side_event_state_0, parent); for (cb = es0->callbacks; cb->u.call != NULL; cb++) { if ((void *) cb->u.call == call && cb->priv == priv) return cb; @@ -154,7 +154,7 @@ int _side_tracer_callback_register(struct side_event_description *desc, event_state = side_ptr_get(desc->state); if (side_unlikely(event_state->version != 0)) abort(); - es0 = side_container_of(event_state, struct side_event_state_0, p); + es0 = side_container_of(event_state, struct side_event_state_0, parent); old_nr_cb = es0->nr_callbacks; if (old_nr_cb == UINT32_MAX) { ret = SIDE_ERROR_INVAL; @@ -233,7 +233,7 @@ static int _side_tracer_callback_unregister(struct side_event_description *desc, event_state = side_ptr_get(desc->state); if (side_unlikely(event_state->version != 0)) abort(); - es0 = side_container_of(event_state, struct side_event_state_0, p); + es0 = side_container_of(event_state, struct side_event_state_0, parent); cb_pos = side_tracer_callback_lookup(desc, call, priv); if (!cb_pos) { ret = SIDE_ERROR_NOENT; @@ -323,7 +323,7 @@ void side_event_remove_callbacks(struct side_event_description *desc) if (side_unlikely(event_state->version != 0)) abort(); - es0 = side_container_of(event_state, struct side_event_state_0, p); + es0 = side_container_of(event_state, struct side_event_state_0, parent); nr_cb = es0->nr_callbacks; if (!nr_cb) return; -- 2.34.1