X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint.h;h=460ad205a481d196d1702f32c44392833cb0724a;hb=009769ca153da7ddfaa63643a84d4d19708b4586;hp=4b773bbc2eead7a60e11415ead1d364e979afa6d;hpb=9501d22f55b3a23f382f631c99b2325d1419b5da;p=lttng-ust.git diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h index 4b773bbc..460ad205 100644 --- a/include/lttng/tracepoint.h +++ b/include/lttng/tracepoint.h @@ -13,6 +13,14 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include @@ -22,6 +30,7 @@ #include /* for memset */ #include #include /* for sdt */ +#include #ifdef LTTNG_UST_HAVE_SDT_INTEGRATION #define SDT_USE_VARIADIC @@ -62,8 +71,12 @@ extern "C" { #define _TP_COMBINE_TOKENS4(_tokena, _tokenb, _tokenc, _tokend) \ __TP_COMBINE_TOKENS4(_tokena, _tokenb, _tokenc, _tokend) -/* _TP_EXVAR* extract the var names. */ +/* + * _TP_EXVAR* extract the var names. + * _TP_EXVAR1 and _TP_EXDATA_VAR1 are needed for -std=c99. + */ #define _TP_EXVAR0() +#define _TP_EXVAR1(a) #define _TP_EXVAR2(a,b) b #define _TP_EXVAR4(a,b,c,d) b,d #define _TP_EXVAR6(a,b,c,d,e,f) b,d,f @@ -76,6 +89,7 @@ extern "C" { #define _TP_EXVAR20(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t) b,d,f,h,j,l,n,p,r,t #define _TP_EXDATA_VAR0() __tp_data +#define _TP_EXDATA_VAR1(a) __tp_data #define _TP_EXDATA_VAR2(a,b) __tp_data,b #define _TP_EXDATA_VAR4(a,b,c,d) __tp_data,b,d #define _TP_EXDATA_VAR6(a,b,c,d,e,f) __tp_data,b,d,f @@ -87,8 +101,12 @@ extern "C" { #define _TP_EXDATA_VAR18(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r) __tp_data,b,d,f,h,j,l,n,p,r #define _TP_EXDATA_VAR20(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t) __tp_data,b,d,f,h,j,l,n,p,r,t -/* _TP_EXPROTO* extract tuples of type, var */ -#define _TP_EXPROTO0() +/* + * _TP_EXPROTO* extract tuples of type, var. + * _TP_EXPROTO1 and _TP_EXDATA_PROTO1 are needed for -std=c99. + */ +#define _TP_EXPROTO0() void +#define _TP_EXPROTO1(a) void #define _TP_EXPROTO2(a,b) a b #define _TP_EXPROTO4(a,b,c,d) a b,c d #define _TP_EXPROTO6(a,b,c,d,e,f) a b,c d,e f @@ -101,6 +119,7 @@ extern "C" { #define _TP_EXPROTO20(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t) a b,c d,e f,g h,i j,k l,m n,o p,q r,s t #define _TP_EXDATA_PROTO0() void *__tp_data +#define _TP_EXDATA_PROTO1(a) void *__tp_data #define _TP_EXDATA_PROTO2(a,b) void *__tp_data,a b #define _TP_EXDATA_PROTO4(a,b,c,d) void *__tp_data,a b,c d #define _TP_EXDATA_PROTO6(a,b,c,d,e,f) void *__tp_data,a b,c d,e f @@ -127,7 +146,10 @@ 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__)) \ +static inline lttng_ust_notrace \ +void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)); \ +static inline \ +void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__)) \ { \ struct tracepoint_probe *__tp_probe; \ \ @@ -138,7 +160,7 @@ static inline void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_A if (caa_unlikely(!__tp_probe)) \ goto end; \ do { \ - void *__tp_cb = __tp_probe->func; \ + void (*__tp_cb)(void) = __tp_probe->func; \ void *__tp_data = __tp_probe->data; \ \ URCU_FORCE_CAST(void (*)(_TP_ARGS_DATA_PROTO(__VA_ARGS__)), __tp_cb) \ @@ -147,21 +169,30 @@ static inline void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_A end: \ tp_rcu_read_unlock_bp(); \ } \ -static inline void __tracepoint_register_##_provider##___##_name(char *name, \ - void *func, void *data) \ +static inline lttng_ust_notrace \ +void __tracepoint_register_##_provider##___##_name(char *name, \ + void (*func)(void), void *data); \ +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 *data) \ +static inline lttng_ust_notrace \ +void __tracepoint_unregister_##_provider##___##_name(char *name, \ + void (*func)(void), void *data); \ +static inline \ +void __tracepoint_unregister_##_provider##___##_name(char *name, \ + void (*func)(void), void *data) \ { \ __tracepoint_probe_unregister(name, func, data); \ } -extern int __tracepoint_probe_register(const char *name, void *func, void *data, - const char *signature); -extern int __tracepoint_probe_unregister(const char *name, void *func, void *data); +extern int __tracepoint_probe_register(const char *name, void (*func)(void), + void *data, const char *signature); +extern int __tracepoint_probe_unregister(const char *name, void (*func)(void), + void *data); /* * tracepoint dynamic linkage handling (callbacks). Hidden visibility: @@ -238,7 +269,10 @@ int __tracepoint_registered struct tracepoint_dlopen tracepoint_dlopen __attribute__((weak, visibility("hidden"))); -static void __attribute__((constructor)) __tracepoints__init(void) +static void lttng_ust_notrace __attribute__((constructor)) +__tracepoints__init(void); +static void +__tracepoints__init(void) { if (__tracepoint_registered++) return; @@ -274,7 +308,10 @@ static void __attribute__((constructor)) __tracepoints__init(void) __start___tracepoints_ptrs); } -static void __attribute__((destructor)) __tracepoints__destroy(void) +static void lttng_ust_notrace __attribute__((destructor)) +__tracepoints__destroy(void); +static void +__tracepoints__destroy(void) { int ret; @@ -489,3 +526,9 @@ enum { #define TRACEPOINT_LOGLEVEL(provider, name, loglevel) #endif /* #ifndef TRACEPOINT_LOGLEVEL */ + +#ifndef TRACEPOINT_MODEL_EMF_URI + +#define TRACEPOINT_MODEL_EMF_URI(provider, name, uri) + +#endif /* #ifndef TRACEPOINT_MODEL_EMF_URI */