From 5e08a34f503468ca1fe35712d92e6d4a9b96b16e Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 3 May 2021 10:08:40 -0400 Subject: [PATCH] Move enabler structures to internal header Signed-off-by: Mathieu Desnoyers Change-Id: I0769e0ea730f5fbf306bce4f5527c81c193cdbe9 --- include/lttng/events-internal.h | 47 ++++++++++++++++++++++++++++++++ include/lttng/events.h | 48 --------------------------------- 2 files changed, 47 insertions(+), 48 deletions(-) diff --git a/include/lttng/events-internal.h b/include/lttng/events-internal.h index a583a2d3..38ae3a7b 100644 --- a/include/lttng/events-internal.h +++ b/include/lttng/events-internal.h @@ -78,6 +78,39 @@ struct lttng_kernel_bytecode_filter_ctx { enum lttng_kernel_bytecode_filter_result result; }; +/* + * Enabler field, within whatever object is enabling an event. Target of + * backward reference. + */ +struct lttng_enabler { + enum lttng_enabler_format_type format_type; + + /* head list of struct lttng_bytecode_node */ + struct list_head filter_bytecode_head; + + struct lttng_kernel_abi_event event_param; + unsigned int enabled:1; + + uint64_t user_token; /* User-provided token. */ +}; + +struct lttng_event_enabler { + struct lttng_enabler base; + struct list_head node; /* per-session list of enablers */ + struct lttng_channel *chan; +}; + +struct lttng_event_notifier_enabler { + struct lttng_enabler base; + uint64_t error_counter_index; + struct list_head node; /* List of event_notifier enablers */ + struct lttng_event_notifier_group *group; + + /* head list of struct lttng_bytecode_node */ + struct list_head capture_bytecode_head; + uint64_t num_captures; +}; + static inline const struct lttng_kernel_type_integer *lttng_kernel_get_type_integer(const struct lttng_kernel_type_common *type) { @@ -157,4 +190,18 @@ int lttng_kernel_interpret_event_filter(const struct lttng_kernel_event_common * struct lttng_probe_ctx *probe_ctx, void *event_filter_ctx); +static inline +struct lttng_enabler *lttng_event_enabler_as_enabler( + struct lttng_event_enabler *event_enabler) +{ + return &event_enabler->base; +} + +static inline +struct lttng_enabler *lttng_event_notifier_enabler_as_enabler( + struct lttng_event_notifier_enabler *event_notifier_enabler) +{ + return &event_notifier_enabler->base; +} + #endif /* _LTTNG_EVENTS_INTERNAL_H */ diff --git a/include/lttng/events.h b/include/lttng/events.h index 464adb2c..2b608dfd 100644 --- a/include/lttng/events.h +++ b/include/lttng/events.h @@ -501,54 +501,6 @@ enum lttng_enabler_format_type { LTTNG_ENABLER_FORMAT_NAME, }; -/* - * Enabler field, within whatever object is enabling an event. Target of - * backward reference. - */ -struct lttng_enabler { - enum lttng_enabler_format_type format_type; - - /* head list of struct lttng_bytecode_node */ - struct list_head filter_bytecode_head; - - struct lttng_kernel_abi_event event_param; - unsigned int enabled:1; - - uint64_t user_token; /* User-provided token. */ -}; - -struct lttng_event_enabler { - struct lttng_enabler base; - struct list_head node; /* per-session list of enablers */ - struct lttng_channel *chan; -}; - -struct lttng_event_notifier_enabler { - struct lttng_enabler base; - uint64_t error_counter_index; - struct list_head node; /* List of event_notifier enablers */ - struct lttng_event_notifier_group *group; - - /* head list of struct lttng_bytecode_node */ - struct list_head capture_bytecode_head; - uint64_t num_captures; -}; - - -static inline -struct lttng_enabler *lttng_event_enabler_as_enabler( - struct lttng_event_enabler *event_enabler) -{ - return &event_enabler->base; -} - -static inline -struct lttng_enabler *lttng_event_notifier_enabler_as_enabler( - struct lttng_event_notifier_enabler *event_notifier_enabler) -{ - return &event_notifier_enabler->base; -} - struct lttng_channel_ops { struct channel *(*channel_create)(const char *name, void *priv, -- 2.34.1