From 106ff4dab82c51bd7bf022220bf43f15fb04f8bc Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 30 Mar 2021 15:42:44 -0400 Subject: [PATCH] cleanup: function attribute 'no_instrument_function' Function attributes should be located after the declaration. Change-Id: I88688e01ca54f525c4c20173c5e8e36b5f2740fa Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- include/lttng/ringbuffer-context.h | 15 +++++++++------ include/lttng/tracepoint.h | 20 ++++++++++++-------- include/lttng/ust-tracepoint-event.h | 25 +++++++++++++++---------- libringbuffer/frontend_types.h | 5 +++-- libringbuffer/ringbuffer-config.h | 5 +++-- 5 files changed, 42 insertions(+), 28 deletions(-) diff --git a/include/lttng/ringbuffer-context.h b/include/lttng/ringbuffer-context.h index 577932df..b80a69cf 100644 --- a/include/lttng/ringbuffer-context.h +++ b/include/lttng/ringbuffer-context.h @@ -60,10 +60,11 @@ struct lttng_ust_lib_ring_buffer_ctx { * @largest_align: largest alignment within data payload types * @ip: caller ip address */ -static inline lttng_ust_notrace +static inline void lttng_ust_lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ctx, void *client_priv, size_t data_size, int largest_align, - void *ip); + void *ip) + lttng_ust_notrace; static inline void lttng_ust_lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ctx, void *client_priv, size_t data_size, int largest_align, @@ -93,8 +94,9 @@ void lttng_ust_lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ct * @align_drift: object offset from an "alignment"-aligned address. * @size_of_type: Must be non-zero, power of 2. */ -static inline lttng_ust_notrace -unsigned int lttng_ust_lib_ring_buffer_align(size_t align_drift, size_t size_of_type); +static inline +unsigned int lttng_ust_lib_ring_buffer_align(size_t align_drift, size_t size_of_type) + lttng_ust_notrace; static inline unsigned int lttng_ust_lib_ring_buffer_align(size_t align_drift, size_t size_of_type) { @@ -110,8 +112,9 @@ unsigned int lttng_ust_lib_ring_buffer_align(size_t align_drift, size_t size_of_ * @align_drift: object offset from an "alignment"-aligned address. * @size_of_type: Must be non-zero, power of 2. */ -static inline lttng_ust_notrace -unsigned int lttng_ust_lib_ring_buffer_align(size_t align_drift, size_t size_of_type); +static inline +unsigned int lttng_ust_lib_ring_buffer_align(size_t align_drift, size_t size_of_type) + lttng_ust_notrace; static inline unsigned int lttng_ust_lib_ring_buffer_align(size_t align_drift, size_t size_of_type) { diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h index 927b1a3c..49db615a 100644 --- a/include/lttng/tracepoint.h +++ b/include/lttng/tracepoint.h @@ -185,9 +185,10 @@ void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)) \ end: \ tp_rcu_read_unlock(); \ } \ -static inline lttng_ust_notrace \ +static inline \ void __tracepoint_register_##_provider##___##_name(char *name, \ - void (*func)(void), void *data); \ + void (*func)(void), void *data) \ + lttng_ust_notrace; \ static inline \ void __tracepoint_register_##_provider##___##_name(char *name, \ void (*func)(void), void *data) \ @@ -195,9 +196,10 @@ void __tracepoint_register_##_provider##___##_name(char *name, \ __tracepoint_probe_register(name, func, data, \ __tracepoint_##_provider##___##_name.signature); \ } \ -static inline lttng_ust_notrace \ +static inline \ void __tracepoint_unregister_##_provider##___##_name(char *name, \ - void (*func)(void), void *data); \ + void (*func)(void), void *data) \ + lttng_ust_notrace; \ static inline \ void __tracepoint_unregister_##_provider##___##_name(char *name, \ void (*func)(void), void *data) \ @@ -310,8 +312,9 @@ static inline void tracepoint_disable_destructors(void) } #ifndef _LGPL_SOURCE -static inline void lttng_ust_notrace -__tracepoint__init_urcu_sym(void); +static inline void +__tracepoint__init_urcu_sym(void) + lttng_ust_notrace; static inline void __tracepoint__init_urcu_sym(void) { @@ -338,8 +341,9 @@ __tracepoint__init_urcu_sym(void) "tp_rcu_dereference_sym")); } #else -static inline void lttng_ust_notrace -__tracepoint__init_urcu_sym(void); +static inline void +__tracepoint__init_urcu_sym(void) + lttng_ust_notrace; static inline void __tracepoint__init_urcu_sym(void) { diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h index cf770759..27229182 100644 --- a/include/lttng/ust-tracepoint-event.h +++ b/include/lttng/ust-tracepoint-event.h @@ -72,8 +72,9 @@ /* Reset all macros within TRACEPOINT_EVENT */ #include -static inline lttng_ust_notrace -void _TP_COMBINE_TOKENS(__tracepoint_provider_mismatch_, TRACEPOINT_PROVIDER)(void); +static inline +void _TP_COMBINE_TOKENS(__tracepoint_provider_mismatch_, TRACEPOINT_PROVIDER)(void) + lttng_ust_notrace; static inline void _TP_COMBINE_TOKENS(__tracepoint_provider_mismatch_, TRACEPOINT_PROVIDER)(void) { @@ -87,8 +88,9 @@ void _TP_COMBINE_TOKENS(__tracepoint_provider_mismatch_, TRACEPOINT_PROVIDER)(vo #define _TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) \ __tracepoint_provider_mismatch_##_provider(); -static inline lttng_ust_notrace -void _TP_COMBINE_TOKENS(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void); +static inline +void _TP_COMBINE_TOKENS(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void) + lttng_ust_notrace; static inline void _TP_COMBINE_TOKENS(__tracepoint_provider_check_, TRACEPOINT_PROVIDER)(void) { @@ -447,8 +449,9 @@ static void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)); #undef _TRACEPOINT_EVENT_CLASS #define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \ -static inline lttng_ust_notrace \ -size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS_DATA_PROTO(_args)); \ +static inline \ +size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS_DATA_PROTO(_args)) \ + lttng_ust_notrace; \ static inline \ size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS_DATA_PROTO(_args)) \ { \ @@ -660,8 +663,9 @@ void __event_prepare_interpreter_stack__##_provider##___##_name(char *__stack_da #undef _TRACEPOINT_EVENT_CLASS #define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \ -static inline lttng_ust_notrace \ -size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)); \ +static inline \ +size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) \ + lttng_ust_notrace; \ static inline \ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) \ { \ @@ -783,8 +787,9 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) \ */ #undef _TRACEPOINT_EVENT_CLASS #define _TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \ -static lttng_ust_notrace \ -void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)); \ +static \ +void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)) \ + lttng_ust_notrace; \ static \ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)) \ { \ diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h index 106c1e12..4e7d2e8f 100644 --- a/libringbuffer/frontend_types.h +++ b/libringbuffer/frontend_types.h @@ -313,9 +313,10 @@ void channel_set_private(struct lttng_ust_lib_ring_buffer_channel *chan, void *p * lttng_ust_lib_ring_buffer_align_ctx - Align context offset on "alignment" * @ctx: ring buffer context. */ -static inline lttng_ust_notrace +static inline void lttng_ust_lib_ring_buffer_align_ctx(struct lttng_ust_lib_ring_buffer_ctx *ctx, - size_t alignment); + size_t alignment) + lttng_ust_notrace; static inline void lttng_ust_lib_ring_buffer_align_ctx(struct lttng_ust_lib_ring_buffer_ctx *ctx, size_t alignment) diff --git a/libringbuffer/ringbuffer-config.h b/libringbuffer/ringbuffer-config.h index a0eddc8b..37669b0d 100644 --- a/libringbuffer/ringbuffer-config.h +++ b/libringbuffer/ringbuffer-config.h @@ -221,10 +221,11 @@ struct lttng_ust_lib_ring_buffer_config { * lib_ring_buffer_check_config() returns 0 on success. * Used internally to check for valid configurations at channel creation. */ -static inline lttng_ust_notrace +static inline int lib_ring_buffer_check_config(const struct lttng_ust_lib_ring_buffer_config *config, unsigned int switch_timer_interval, - unsigned int read_timer_interval); + unsigned int read_timer_interval) + lttng_ust_notrace; static inline int lib_ring_buffer_check_config(const struct lttng_ust_lib_ring_buffer_config *config, unsigned int switch_timer_interval, -- 2.34.1