From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
To: "Woegerer, Paul" <Paul_Woegerer@mentor.com>
Cc: lttng-dev@lists.lttng.org
Subject: Re: notrace missing in lttng-ust
Date: Wed, 18 Jul 2012 15:32:24 -0400 [thread overview]
Message-ID: <20120718193224.GA8531__20529.9958274283$1342639987$gmane$org@Krystal> (raw)
In-Reply-To: <5006B15F.30509@mentor.com>
I ended up pushing your work as:
commit a8909ba54718ed54cefb1b839a5d41a065df09f9
Author: Paul Woegerer <paul_woegerer@mentor.com>
Date: Wed Jul 18 15:28:44 2012 -0400
Make lttng-ust robust against -finstrument-functions.
[ Edit by Mathieu Desnoyers:
We need to declare the no_instrument_function attribute on function
declarations (rather than definition) for g++. Moved the attribute prior
to the function declaration (rather than after) to follow the coding
style within LTTng-UST. ]
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Indeed, g++ is weird.
Thanks!
Mathieu
* Woegerer, Paul (Paul_Woegerer@mentor.com) wrote:
> On 07/18/2012 01:42 PM, Mathieu Desnoyers wrote:
>
>> e.g. here:
>>
>> static lttng_ust_notrace
>> void lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ctx,
>> struct channel *chan, void *priv,
>> size_t data_size, int largest_align,
>> int cpu, struct lttng_ust_shm_handle *handle)
>> {
>> ... body of function ...
>> }
>
> For ringbuffer-config.h that will work but if you try the same in
> tracepoint.h:258 with:
>
> static lttng_ust_notrace void __attribute__((constructor))
> __tracepoints__init(void)
>
> you get:
>
> Making all in hello.cxx
> make[3]: Entering directory
> `/home/pwoegere/MGC/SA/lttng-ust/tests/hello.cxx'
> CXX hello.o
> In file included from ust_tests_hello.h:21:0,
> from hello.cpp:33:
> ../../include/lttng/tracepoint.h:258:60: error: can’t set
> ‘no_instrument_function’ attribute after definition
>
> or if you try it in the macro definitons at tracepoint.h:141
>
> you get:
>
> Making all in hello.cxx
> make[3]: Entering directory
> `/home/pwoegere/MGC/SA/lttng-ust/tests/hello.cxx'
> CXX hello.o
> In file included from hello.cpp:33:0:
> ust_tests_hello.h:43:1: error: can’t set ‘no_instrument_function’
> attribute after definition
> ust_tests_hello.h:43:1: error: can’t set ‘no_instrument_function’
> attribute after definition
> ust_tests_hello.h:43:1: error: can’t set ‘no_instrument_function’
> attribute after definition
> ust_tests_hello.h:48:1: error: can’t set ‘no_instrument_function’
> attribute after definition
> ust_tests_hello.h:48:1: error: can’t set ‘no_instrument_function’
> attribute after definition
> ust_tests_hello.h:48:1: error: can’t set ‘no_instrument_function’
> attribute after definition
>
>
> Anyway I send you a patch that uses the attribute on the definitions
> wherever possible.
>
> --
> Paul
>
>>
>> Thanks,
>>
>> Mathieu
>>
>>> {
>>> ctx->chan = chan;
>>> @@ -276,6 +282,8 @@ void lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ctx,
>>> * size_of_type must be non-zero.
>>> */
>>> static inline
>>> +unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type) lttng_ust_notrace;
>>> +static inline
>>> unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type)
>>> {
>>> return offset_align(align_drift, size_of_type);
>>> @@ -290,6 +298,8 @@ unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type)
>>> * size_of_type must be non-zero.
>>> */
>>> static inline
>>> +unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type) lttng_ust_notrace;
>>> +static inline
>>> unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type)
>>> {
>>> return 0;
>>> @@ -303,6 +313,9 @@ unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type)
>>> */
>>> static inline
>>> void lib_ring_buffer_align_ctx(struct lttng_ust_lib_ring_buffer_ctx *ctx,
>>> + size_t alignment) lttng_ust_notrace;
>>> +static inline
>>> +void lib_ring_buffer_align_ctx(struct lttng_ust_lib_ring_buffer_ctx *ctx,
>>> size_t alignment)
>>> {
>>> ctx->buf_offset += lib_ring_buffer_align(ctx->buf_offset,
>>> @@ -316,6 +329,10 @@ void lib_ring_buffer_align_ctx(struct lttng_ust_lib_ring_buffer_ctx *ctx,
>>> 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) 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)
>>> {
>>> if (config->alloc == RING_BUFFER_ALLOC_GLOBAL
>>> diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
>>> index 5bab476..77595d3 100644
>>> --- a/include/lttng/tracepoint.h
>>> +++ b/include/lttng/tracepoint.h
>>> @@ -22,6 +22,7 @@
>>> #include <string.h> /* for memset */
>>> #include <assert.h>
>>> #include <lttng/ust-config.h> /* for sdt */
>>> +#include <lttng/ust-compiler.h>
>>> #ifdef LTTNG_UST_HAVE_SDT_INTEGRATION
>>> #define SDT_USE_VARIADIC
>>> @@ -137,6 +138,7 @@ extern "C" {
>>> #define _DECLARE_TRACEPOINT(_provider, _name, ...) \
>>> extern struct tracepoint __tracepoint_##_provider##___##_name; \
>>> +static inline void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)) lttng_ust_notrace; \
>>> static inline void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)) \
>>> { \
>>> struct tracepoint_probe *__tp_probe; \
>>> @@ -158,12 +160,16 @@ end: \
>>> tp_rcu_read_unlock_bp(); \
>>> } \
>>> static inline void __tracepoint_register_##_provider##___##_name(char *name, \
>>> + void (*func)(void), void *data) lttng_ust_notrace; \
>>> +static inline void __tracepoint_register_##_provider##___##_name(char *name, \
>>> void (*func)(void), void *data) \
>>> { \
>>> __tracepoint_probe_register(name, func, data, \
>>> __tracepoint_##_provider##___##_name.signature); \
>>> } \
>>> static inline void __tracepoint_unregister_##_provider##___##_name(char *name, \
>>> + void (*func)(void), void *data) lttng_ust_notrace; \
>>> +static inline void __tracepoint_unregister_##_provider##___##_name(char *name, \
>>> void (*func)(void), void *data) \
>>> { \
>>> __tracepoint_probe_unregister(name, func, data); \
>>> @@ -249,6 +255,7 @@ int __tracepoint_registered
>>> struct tracepoint_dlopen tracepoint_dlopen
>>> __attribute__((weak, visibility("hidden")));
>>> +static void __attribute__((constructor)) __tracepoints__init(void)
>>> lttng_ust_notrace;
>>> static void __attribute__((constructor)) __tracepoints__init(void)
>>> {
>>> if (__tracepoint_registered++)
>>> @@ -285,6 +292,7 @@ static void __attribute__((constructor)) __tracepoints__init(void)
>>> __start___tracepoints_ptrs);
>>> }
>>> +static void __attribute__((destructor))
>>> __tracepoints__destroy(void) lttng_ust_notrace;
>>> static void __attribute__((destructor)) __tracepoints__destroy(void)
>>> {
>>> int ret;
>>> diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h
>>> new file mode 100644
>>> index 0000000..c35a23e
>>> --- /dev/null
>>> +++ b/include/lttng/ust-compiler.h
>>> @@ -0,0 +1,21 @@
>>> +#ifndef _LTTNG_UST_COMPILER_H
>>> +#define _LTTNG_UST_COMPILER_H
>>> +
>>> +/*
>>> + * Copyright 2011-2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
>>> + * Paul Woegerer <paul_woegerer@mentor.com>
>>> + *
>>> + * Permission is hereby granted, free of charge, to any person obtaining a copy
>>> + * of this software and associated documentation files (the "Software"), to deal
>>> + * in the Software without restriction, including without limitation the rights
>>> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>>> + * copies of the Software, and to permit persons to whom the Software is
>>> + * furnished to do so, subject to the following conditions:
>>> + *
>>> + * The above copyright notice and this permission notice shall be included in
>>> + * all copies or substantial portions of the Software.
>>> + */
>>> +
>>> +#define lttng_ust_notrace __attribute__((no_instrument_function))
>>> +
>>> +#endif /* _LTTNG_UST_COMPILER_H */
>>> diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
>>> index 8db1e68..8628dbe 100644
>>> --- a/include/lttng/ust-tracepoint-event.h
>>> +++ b/include/lttng/ust-tracepoint-event.h
>>> @@ -16,6 +16,7 @@
>>> #include <urcu/compiler.h>
>>> #include <lttng/ust-events.h>
>>> #include <lttng/ringbuffer-config.h>
>>> +#include <lttng/ust-compiler.h>
>>> #include <string.h>
>>> /*
>>> @@ -244,6 +245,7 @@ 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 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)) \
>>> { \
>>> size_t __event_len = 0; \
>>> @@ -361,6 +363,7 @@ void __event_prepare_filter_stack__##_provider##___##_name(char *__stack_data,\
>>> #undef TRACEPOINT_EVENT_CLASS
>>> #define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
>>> static inline \
>>> +size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) lttng_ust_notrace; \
>>> size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) \
>>> { \
>>> size_t __event_align = 1; \
>>> @@ -438,6 +441,7 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) \
>>> */
>>> #undef TRACEPOINT_EVENT_CLASS
>>> #define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
>>> +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))\
>>> { \
>>> struct ltt_event *__event = __tp_data; \
>>> @@ -594,6 +598,8 @@ static struct lttng_probe_desc _TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PR
>>> /* Reset all macros within TRACEPOINT_EVENT */
>>> #include <lttng/ust-tracepoint-event-reset.h>
>>> static void __attribute__((constructor))
>>> +_TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void) lttng_ust_notrace;
>>> +static void __attribute__((constructor))
>>> _TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void)
>>> {
>>> int ret;
>>> @@ -603,6 +609,8 @@ _TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void)
>>> }
>>> static void __attribute__((destructor))
>>> +_TP_COMBINE_TOKENS(__lttng_events_exit__, TRACEPOINT_PROVIDER)(void) lttng_ust_notrace;
>>> +static void __attribute__((destructor))
>>> _TP_COMBINE_TOKENS(__lttng_events_exit__, TRACEPOINT_PROVIDER)(void)
>>> {
>>> ltt_probe_unregister(&_TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER));
>>> --
>>> 1.7.10.4
>>>
>>
>
>
> --
> Paul Woegerer | SW Development Engineer
> Mentor Embedded(tm) | Prinz Eugen Straße 72/2/4, Vienna, 1040 Austria
> P 43.1.535991320
> Nucleus® | Linux® | Android(tm) | Services | UI | Multi-OS
>
> Android is a trademark of Google Inc. Use of this trademark is subject to Google Permissions.
> Linux is the registered trademark of Linus Torvalds in the U.S. and other countries.
>
> From 46e709a85edbca6b9c869148cadd2abac2f98acf Mon Sep 17 00:00:00 2001
> From: Paul Woegerer <paul_woegerer@mentor.com>
> Date: Wed, 18 Jul 2012 12:27:07 +0200
> Subject: [PATCH 1/2] Make lttng-ust robust against -finstrument-functions.
>
> ---
> include/Makefile.am | 1 +
> include/lttng/ringbuffer-config.h | 17 +++++++++++++++++
> include/lttng/tracepoint.h | 8 ++++++++
> include/lttng/ust-compiler.h | 21 +++++++++++++++++++++
> include/lttng/ust-tracepoint-event.h | 8 ++++++++
> 5 files changed, 55 insertions(+)
> create mode 100644 include/lttng/ust-compiler.h
>
> diff --git a/include/Makefile.am b/include/Makefile.am
> index 633260b..208e74e 100644
> --- a/include/Makefile.am
> +++ b/include/Makefile.am
> @@ -14,6 +14,7 @@ nobase_include_HEADERS = \
> lttng/ringbuffer-abi.h \
> lttng/ust-tracer.h \
> lttng/ust-config.h \
> + lttng/ust-compiler.h \
> lttng/ust.h \
> lttng/ust-endian.h \
> lttng/ringbuffer-config.h \
> diff --git a/include/lttng/ringbuffer-config.h b/include/lttng/ringbuffer-config.h
> index 24e7dbe..408d95a 100644
> --- a/include/lttng/ringbuffer-config.h
> +++ b/include/lttng/ringbuffer-config.h
> @@ -27,6 +27,7 @@
> #include <urcu/arch.h>
> #include <string.h>
> #include "lttng/align.h"
> +#include <lttng/ust-compiler.h>
>
> struct lttng_ust_lib_ring_buffer;
> struct channel;
> @@ -232,6 +233,11 @@ static inline
> void lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ctx,
> struct channel *chan, void *priv,
> size_t data_size, int largest_align,
> + int cpu, struct lttng_ust_shm_handle *handle) lttng_ust_notrace;
> +static inline
> +void lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ctx,
> + struct channel *chan, void *priv,
> + size_t data_size, int largest_align,
> int cpu, struct lttng_ust_shm_handle *handle)
> {
> ctx->chan = chan;
> @@ -276,6 +282,8 @@ void lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ctx,
> * size_of_type must be non-zero.
> */
> static inline
> +unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type) lttng_ust_notrace;
> +static inline
> unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type)
> {
> return offset_align(align_drift, size_of_type);
> @@ -290,6 +298,8 @@ unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type)
> * size_of_type must be non-zero.
> */
> static inline
> +unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type) lttng_ust_notrace;
> +static inline
> unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type)
> {
> return 0;
> @@ -303,6 +313,9 @@ unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type)
> */
> static inline
> void lib_ring_buffer_align_ctx(struct lttng_ust_lib_ring_buffer_ctx *ctx,
> + size_t alignment) lttng_ust_notrace;
> +static inline
> +void lib_ring_buffer_align_ctx(struct lttng_ust_lib_ring_buffer_ctx *ctx,
> size_t alignment)
> {
> ctx->buf_offset += lib_ring_buffer_align(ctx->buf_offset,
> @@ -316,6 +329,10 @@ void lib_ring_buffer_align_ctx(struct lttng_ust_lib_ring_buffer_ctx *ctx,
> 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) 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)
> {
> if (config->alloc == RING_BUFFER_ALLOC_GLOBAL
> diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
> index 5bab476..77595d3 100644
> --- a/include/lttng/tracepoint.h
> +++ b/include/lttng/tracepoint.h
> @@ -22,6 +22,7 @@
> #include <string.h> /* for memset */
> #include <assert.h>
> #include <lttng/ust-config.h> /* for sdt */
> +#include <lttng/ust-compiler.h>
>
> #ifdef LTTNG_UST_HAVE_SDT_INTEGRATION
> #define SDT_USE_VARIADIC
> @@ -137,6 +138,7 @@ extern "C" {
>
> #define _DECLARE_TRACEPOINT(_provider, _name, ...) \
> extern struct tracepoint __tracepoint_##_provider##___##_name; \
> +static inline void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)) lttng_ust_notrace; \
> static inline void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)) \
> { \
> struct tracepoint_probe *__tp_probe; \
> @@ -158,12 +160,16 @@ end: \
> tp_rcu_read_unlock_bp(); \
> } \
> static inline void __tracepoint_register_##_provider##___##_name(char *name, \
> + void (*func)(void), void *data) lttng_ust_notrace; \
> +static inline void __tracepoint_register_##_provider##___##_name(char *name, \
> void (*func)(void), void *data) \
> { \
> __tracepoint_probe_register(name, func, data, \
> __tracepoint_##_provider##___##_name.signature); \
> } \
> static inline void __tracepoint_unregister_##_provider##___##_name(char *name, \
> + void (*func)(void), void *data) lttng_ust_notrace; \
> +static inline void __tracepoint_unregister_##_provider##___##_name(char *name, \
> void (*func)(void), void *data) \
> { \
> __tracepoint_probe_unregister(name, func, data); \
> @@ -249,6 +255,7 @@ int __tracepoint_registered
> struct tracepoint_dlopen tracepoint_dlopen
> __attribute__((weak, visibility("hidden")));
>
> +static void __attribute__((constructor)) __tracepoints__init(void) lttng_ust_notrace;
> static void __attribute__((constructor)) __tracepoints__init(void)
> {
> if (__tracepoint_registered++)
> @@ -285,6 +292,7 @@ static void __attribute__((constructor)) __tracepoints__init(void)
> __start___tracepoints_ptrs);
> }
>
> +static void __attribute__((destructor)) __tracepoints__destroy(void) lttng_ust_notrace;
> static void __attribute__((destructor)) __tracepoints__destroy(void)
> {
> int ret;
> diff --git a/include/lttng/ust-compiler.h b/include/lttng/ust-compiler.h
> new file mode 100644
> index 0000000..c35a23e
> --- /dev/null
> +++ b/include/lttng/ust-compiler.h
> @@ -0,0 +1,21 @@
> +#ifndef _LTTNG_UST_COMPILER_H
> +#define _LTTNG_UST_COMPILER_H
> +
> +/*
> + * Copyright 2011-2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
> + * Paul Woegerer <paul_woegerer@mentor.com>
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a copy
> + * of this software and associated documentation files (the "Software"), to deal
> + * in the Software without restriction, including without limitation the rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + */
> +
> +#define lttng_ust_notrace __attribute__((no_instrument_function))
> +
> +#endif /* _LTTNG_UST_COMPILER_H */
> diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
> index 8db1e68..8628dbe 100644
> --- a/include/lttng/ust-tracepoint-event.h
> +++ b/include/lttng/ust-tracepoint-event.h
> @@ -16,6 +16,7 @@
> #include <urcu/compiler.h>
> #include <lttng/ust-events.h>
> #include <lttng/ringbuffer-config.h>
> +#include <lttng/ust-compiler.h>
> #include <string.h>
>
> /*
> @@ -244,6 +245,7 @@ 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 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)) \
> { \
> size_t __event_len = 0; \
> @@ -361,6 +363,7 @@ void __event_prepare_filter_stack__##_provider##___##_name(char *__stack_data,\
> #undef TRACEPOINT_EVENT_CLASS
> #define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
> static inline \
> +size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) lttng_ust_notrace; \
> size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) \
> { \
> size_t __event_align = 1; \
> @@ -438,6 +441,7 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) \
> */
> #undef TRACEPOINT_EVENT_CLASS
> #define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
> +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))\
> { \
> struct ltt_event *__event = __tp_data; \
> @@ -594,6 +598,8 @@ static struct lttng_probe_desc _TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PR
> /* Reset all macros within TRACEPOINT_EVENT */
> #include <lttng/ust-tracepoint-event-reset.h>
> static void __attribute__((constructor))
> +_TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void) lttng_ust_notrace;
> +static void __attribute__((constructor))
> _TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void)
> {
> int ret;
> @@ -603,6 +609,8 @@ _TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void)
> }
>
> static void __attribute__((destructor))
> +_TP_COMBINE_TOKENS(__lttng_events_exit__, TRACEPOINT_PROVIDER)(void) lttng_ust_notrace;
> +static void __attribute__((destructor))
> _TP_COMBINE_TOKENS(__lttng_events_exit__, TRACEPOINT_PROVIDER)(void)
> {
> ltt_probe_unregister(&_TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER));
> --
> 1.7.10.4
>
> From 94372244110b3bc5e3223310525b349c8320be7e Mon Sep 17 00:00:00 2001
> From: Paul Woegerer <paul_woegerer@mentor.com>
> Date: Wed, 18 Jul 2012 14:46:25 +0200
> Subject: [PATCH 2/2] Use lttng_ust_notrace on definitons (instead of
> declarations) where possible.
>
> ---
> include/lttng/ringbuffer-config.h | 26 +++++---------------------
> include/lttng/ust-tracepoint-event.h | 17 +++++------------
> 2 files changed, 10 insertions(+), 33 deletions(-)
>
> diff --git a/include/lttng/ringbuffer-config.h b/include/lttng/ringbuffer-config.h
> index 408d95a..558e071 100644
> --- a/include/lttng/ringbuffer-config.h
> +++ b/include/lttng/ringbuffer-config.h
> @@ -229,12 +229,7 @@ struct lttng_ust_lib_ring_buffer_ctx {
> * @largest_align: largest alignment within data payload types
> * @cpu: processor id
> */
> -static inline
> -void lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ctx,
> - struct channel *chan, void *priv,
> - size_t data_size, int largest_align,
> - int cpu, struct lttng_ust_shm_handle *handle) lttng_ust_notrace;
> -static inline
> +static inline lttng_ust_notrace
> void lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ctx,
> struct channel *chan, void *priv,
> size_t data_size, int largest_align,
> @@ -281,9 +276,7 @@ void lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ctx,
> * Calculate the offset needed to align the type.
> * size_of_type must be non-zero.
> */
> -static inline
> -unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type) lttng_ust_notrace;
> -static inline
> +static inline lttng_ust_notrace
> unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type)
> {
> return offset_align(align_drift, size_of_type);
> @@ -297,9 +290,7 @@ unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type)
> * Calculate the offset needed to align the type.
> * size_of_type must be non-zero.
> */
> -static inline
> -unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type) lttng_ust_notrace;
> -static inline
> +static inline lttng_ust_notrace
> unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type)
> {
> return 0;
> @@ -311,10 +302,7 @@ unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type)
> * lib_ring_buffer_align_ctx - Align context offset on "alignment"
> * @ctx: ring buffer context.
> */
> -static inline
> -void lib_ring_buffer_align_ctx(struct lttng_ust_lib_ring_buffer_ctx *ctx,
> - size_t alignment) lttng_ust_notrace;
> -static inline
> +static inline lttng_ust_notrace
> void lib_ring_buffer_align_ctx(struct lttng_ust_lib_ring_buffer_ctx *ctx,
> size_t alignment)
> {
> @@ -326,11 +314,7 @@ void lib_ring_buffer_align_ctx(struct lttng_ust_lib_ring_buffer_ctx *ctx,
> * lib_ring_buffer_check_config() returns 0 on success.
> * Used internally to check for valid configurations at channel creation.
> */
> -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) lttng_ust_notrace;
> -static inline
> +static inline lttng_ust_notrace
> 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)
> diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
> index 8628dbe..6fbd1d8 100644
> --- a/include/lttng/ust-tracepoint-event.h
> +++ b/include/lttng/ust-tracepoint-event.h
> @@ -245,8 +245,7 @@ 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 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)) \
> +static inline lttng_ust_notrace size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS_DATA_PROTO(_args)) \
> { \
> size_t __event_len = 0; \
> unsigned int __dynamic_len_idx = 0; \
> @@ -362,8 +361,7 @@ void __event_prepare_filter_stack__##_provider##___##_name(char *__stack_data,\
>
> #undef TRACEPOINT_EVENT_CLASS
> #define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
> -static inline \
> -size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) lttng_ust_notrace; \
> +static inline lttng_ust_notrace \
> size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) \
> { \
> size_t __event_align = 1; \
> @@ -441,8 +439,7 @@ size_t __event_get_align__##_provider##___##_name(_TP_ARGS_PROTO(_args)) \
> */
> #undef TRACEPOINT_EVENT_CLASS
> #define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
> -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))\
> +static lttng_ust_notrace void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))\
> { \
> struct ltt_event *__event = __tp_data; \
> struct ltt_channel *__chan = __event->chan; \
> @@ -597,9 +594,7 @@ static struct lttng_probe_desc _TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PR
>
> /* Reset all macros within TRACEPOINT_EVENT */
> #include <lttng/ust-tracepoint-event-reset.h>
> -static void __attribute__((constructor))
> -_TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void) lttng_ust_notrace;
> -static void __attribute__((constructor))
> +static lttng_ust_notrace void __attribute__((constructor))
> _TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void)
> {
> int ret;
> @@ -608,9 +603,7 @@ _TP_COMBINE_TOKENS(__lttng_events_init__, TRACEPOINT_PROVIDER)(void)
> assert(!ret);
> }
>
> -static void __attribute__((destructor))
> -_TP_COMBINE_TOKENS(__lttng_events_exit__, TRACEPOINT_PROVIDER)(void) lttng_ust_notrace;
> -static void __attribute__((destructor))
> +static lttng_ust_notrace void __attribute__((destructor))
> _TP_COMBINE_TOKENS(__lttng_events_exit__, TRACEPOINT_PROVIDER)(void)
> {
> ltt_probe_unregister(&_TP_COMBINE_TOKENS(__probe_desc___, TRACEPOINT_PROVIDER));
> --
> 1.7.10.4
>
--
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
next prev parent reply other threads:[~2012-07-18 19:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4FED6718.1000205@mentor.com>
2012-06-30 18:16 ` notrace missing in lttng-ust Mathieu Desnoyers
[not found] ` <20120630181600.GB30747@Krystal>
2012-07-03 7:45 ` Woegerer, Paul
[not found] ` <4FF2A31D.9020100@mentor.com>
2012-07-17 13:42 ` Woegerer, Paul
2012-07-17 14:13 ` Mathieu Desnoyers
[not found] ` <20120717141301.GA21204@Krystal>
2012-07-18 10:33 ` Woegerer, Paul
[not found] ` <500690E4.4020503@mentor.com>
2012-07-18 11:42 ` Mathieu Desnoyers
[not found] ` <20120718114216.GA4061@Krystal>
2012-07-18 12:51 ` Woegerer, Paul
[not found] ` <5006B15F.30509@mentor.com>
2012-07-18 19:32 ` Mathieu Desnoyers [this message]
2012-10-01 4:06 ` Francis Giraldeau
[not found] ` <506916A9.2050308@gmail.com>
2012-10-01 15:29 ` Mathieu Desnoyers
2012-06-29 8:28 Woegerer, Paul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='20120718193224.GA8531__20529.9958274283$1342639987$gmane$org@Krystal' \
--to=mathieu.desnoyers@efficios.com \
--cc=Paul_Woegerer@mentor.com \
--cc=lttng-dev@lists.lttng.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.