From: Mathieu Desnoyers Date: Fri, 22 Oct 2021 20:16:26 +0000 (-0400) Subject: Rename event/notifier enabler base field to parent X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=5b9817aed64e239c4a2e2a1564869402074b080d;p=lttng-modules.git Rename event/notifier enabler base field to parent Signed-off-by: Mathieu Desnoyers Change-Id: I06d707d26c4e582fd1b48de9df5d0e32ab950b22 --- diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h index 155b581f..67dd0df5 100644 --- a/include/lttng/events-internal.h +++ b/include/lttng/events-internal.h @@ -220,14 +220,14 @@ struct lttng_event_enabler_common { }; struct lttng_event_enabler { - struct lttng_event_enabler_common base; + struct lttng_event_enabler_common parent; struct list_head node; /* per-session list of enablers */ bool published; /* published in per-session list. */ struct lttng_kernel_channel_buffer *chan; }; struct lttng_event_notifier_enabler { - struct lttng_event_enabler_common base; + struct lttng_event_enabler_common parent; uint64_t error_counter_index; struct list_head node; /* List of event_notifier enablers */ struct lttng_event_notifier_group *group; @@ -587,14 +587,14 @@ static inline struct lttng_event_enabler_common *lttng_event_enabler_as_enabler( struct lttng_event_enabler *event_enabler) { - return &event_enabler->base; + return &event_enabler->parent; } static inline struct lttng_event_enabler_common *lttng_event_notifier_enabler_as_enabler( struct lttng_event_notifier_enabler *event_notifier_enabler) { - return &event_notifier_enabler->base; + return &event_notifier_enabler->parent; } int lttng_context_init(void); diff --git a/src/lttng-events.c b/src/lttng-events.c index 4c7e7157..1d3cb28e 100644 --- a/src/lttng-events.c +++ b/src/lttng-events.c @@ -863,7 +863,7 @@ struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct l const struct lttng_kernel_event_desc *event_desc) { struct lttng_kernel_channel_buffer *chan = event_enabler->chan; - struct lttng_kernel_abi_event *event_param = &event_enabler->base.event_param; + struct lttng_kernel_abi_event *event_param = &event_enabler->parent.event_param; enum lttng_kernel_abi_instrumentation itype = event_param->instrumentation; struct lttng_kernel_session *session = chan->parent.session; struct lttng_kernel_event_recorder *event_recorder; @@ -2093,7 +2093,7 @@ int lttng_event_notifier_enabler_match_event_notifier(struct lttng_event_notifie return 0; if (lttng_desc_match_enabler(event_notifier->priv->parent.desc, base_enabler) && event_notifier->priv->group == event_notifier_enabler->group - && event_notifier->priv->parent.user_token == event_notifier_enabler->base.user_token) + && event_notifier->priv->parent.user_token == event_notifier_enabler->parent.user_token) return 1; else return 0; @@ -2202,7 +2202,7 @@ void lttng_create_tracepoint_event_notifier_if_missing(struct lttng_event_notifi LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name); lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) { if (event_notifier_priv->parent.desc == desc - && event_notifier_priv->parent.user_token == event_notifier_enabler->base.user_token) + && event_notifier_priv->parent.user_token == event_notifier_enabler->parent.user_token) found = 1; } if (found) @@ -2212,7 +2212,7 @@ void lttng_create_tracepoint_event_notifier_if_missing(struct lttng_event_notifi * We need to create a event_notifier for this event probe. */ event_notifier = _lttng_event_notifier_create(desc, - event_notifier_enabler->base.user_token, + event_notifier_enabler->parent.user_token, event_notifier_enabler->error_counter_index, event_notifier_group, NULL, LTTNG_KERNEL_ABI_TRACEPOINT); @@ -2252,7 +2252,7 @@ void lttng_create_syscall_event_notifier_if_missing(struct lttng_event_notifier_ static void lttng_create_event_if_missing(struct lttng_event_enabler *event_enabler) { - switch (event_enabler->base.event_param.instrumentation) { + switch (event_enabler->parent.event_param.instrumentation) { case LTTNG_KERNEL_ABI_TRACEPOINT: lttng_create_tracepoint_event_if_missing(event_enabler); break; @@ -2338,7 +2338,7 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler) static void lttng_create_event_notifier_if_missing(struct lttng_event_notifier_enabler *event_notifier_enabler) { - switch (event_notifier_enabler->base.event_param.instrumentation) { + switch (event_notifier_enabler->parent.event_param.instrumentation) { case LTTNG_KERNEL_ABI_TRACEPOINT: lttng_create_tracepoint_event_notifier_if_missing(event_notifier_enabler); break; @@ -2446,7 +2446,7 @@ static bool lttng_event_notifier_group_has_active_event_notifiers( list_for_each_entry(event_notifier_enabler, &event_notifier_group->enablers_head, node) { - if (event_notifier_enabler->base.enabled) + if (event_notifier_enabler->parent.enabled) return true; } return false; @@ -2482,13 +2482,13 @@ struct lttng_event_enabler *lttng_event_enabler_create( event_enabler = kzalloc(sizeof(*event_enabler), GFP_KERNEL); if (!event_enabler) return NULL; - event_enabler->base.format_type = format_type; - INIT_LIST_HEAD(&event_enabler->base.filter_bytecode_head); - memcpy(&event_enabler->base.event_param, event_param, - sizeof(event_enabler->base.event_param)); + event_enabler->parent.format_type = format_type; + INIT_LIST_HEAD(&event_enabler->parent.filter_bytecode_head); + memcpy(&event_enabler->parent.event_param, event_param, + sizeof(event_enabler->parent.event_param)); event_enabler->chan = chan; /* ctx left NULL */ - event_enabler->base.enabled = 0; + event_enabler->parent.enabled = 0; return event_enabler; } @@ -2613,18 +2613,18 @@ struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create( if (!event_notifier_enabler) return NULL; - event_notifier_enabler->base.format_type = format_type; - INIT_LIST_HEAD(&event_notifier_enabler->base.filter_bytecode_head); + event_notifier_enabler->parent.format_type = format_type; + INIT_LIST_HEAD(&event_notifier_enabler->parent.filter_bytecode_head); INIT_LIST_HEAD(&event_notifier_enabler->capture_bytecode_head); event_notifier_enabler->error_counter_index = event_notifier_param->error_counter_index; event_notifier_enabler->num_captures = 0; - memcpy(&event_notifier_enabler->base.event_param, &event_notifier_param->event, - sizeof(event_notifier_enabler->base.event_param)); + memcpy(&event_notifier_enabler->parent.event_param, &event_notifier_param->event, + sizeof(event_notifier_enabler->parent.event_param)); - event_notifier_enabler->base.enabled = 0; - event_notifier_enabler->base.user_token = event_notifier_param->event.token; + event_notifier_enabler->parent.enabled = 0; + event_notifier_enabler->parent.user_token = event_notifier_param->event.token; event_notifier_enabler->group = event_notifier_group; mutex_lock(&sessions_mutex); diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c index 8feb384c..9d28ba3f 100644 --- a/src/lttng-syscalls.c +++ b/src/lttng-syscalls.c @@ -1003,7 +1003,7 @@ int create_unknown_event_notifier( const struct lttng_kernel_event_desc *desc; struct lttng_event_notifier_group *group = event_notifier_enabler->group; struct lttng_kernel_abi_event_notifier event_notifier_param; - uint64_t user_token = event_notifier_enabler->base.user_token; + uint64_t user_token = event_notifier_enabler->parent.user_token; uint64_t error_counter_index = event_notifier_enabler->error_counter_index; struct lttng_event_enabler_common *base_enabler = lttng_event_notifier_enabler_as_enabler( event_notifier_enabler); @@ -1089,7 +1089,7 @@ static int create_matching_event_notifiers( { struct lttng_event_notifier_group *group = event_notifier_enabler->group; const struct lttng_kernel_event_desc *desc; - uint64_t user_token = event_notifier_enabler->base.user_token; + uint64_t user_token = event_notifier_enabler->parent.user_token; uint64_t error_counter_index = event_notifier_enabler->error_counter_index; unsigned int i; int ret = 0; @@ -1119,7 +1119,7 @@ static int create_matching_event_notifiers( LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name); lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) { if (event_notifier_priv->parent.desc == desc - && event_notifier_priv->parent.user_token == event_notifier_enabler->base.user_token) + && event_notifier_priv->parent.user_token == event_notifier_enabler->parent.user_token) found = 1; } if (found)