X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-event.h;h=4044339d255e421aa2d8d9d1d2a7687b16856b5d;hb=061fc37ae64a1ad3ecefe10d9a2db33ebb5c41ce;hp=c1ca31c85e11a64d0f5b0b5080e08282a06cec58;hpb=6453d2377ce8ab5a45bb40c297db5a128f67f56f;p=lttng-ust.git diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h index c1ca31c8..4044339d 100644 --- a/include/lttng/tracepoint-event.h +++ b/include/lttng/tracepoint-event.h @@ -1,66 +1,96 @@ /* - * Copyright (c) 2011 - Mathieu Desnoyers + * SPDX-License-Identifier: MIT * - * 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. - * - * 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. + * Copyright (C) 2011 Mathieu Desnoyers */ -#ifdef TRACEPOINT_CREATE_PROBES +#include + -#define __tp_stringify1(x) #x -#define __tp_stringify(x) __tp_stringify1(x) +#if LTTNG_UST_COMPAT_API(0) +# if defined(TRACEPOINT_CREATE_PROBES) && !defined(LTTNG_UST_TRACEPOINT_CREATE_PROBES) +# define LTTNG_UST_TRACEPOINT_CREATE_PROBES +# endif +#endif /* #if LTTNG_UST_COMPAT_API(0) */ -#undef TRACEPOINT_EVENT_INSTANCE -#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) +#ifdef LTTNG_UST_TRACEPOINT_CREATE_PROBES -#undef TRACEPOINT_EVENT -#define TRACEPOINT_EVENT(_provider, _name, _args, _fields) \ - TRACEPOINT_EVENT_CLASS(_provider, _name, _TP_PARAMS(_args), \ - _TP_PARAMS(_fields)) \ - TRACEPOINT_EVENT_INSTANCE(_provider, _name, _name, \ - _TP_PARAMS(_args)) +#define lttng_ust__tp_stringify1(x) #x +#define lttng_ust__tp_stringify(x) lttng_ust__tp_stringify1(x) +#undef LTTNG_UST_TRACEPOINT_EVENT_INSTANCE +#define LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) +#undef LTTNG_UST_TRACEPOINT_EVENT +#define LTTNG_UST_TRACEPOINT_EVENT(_provider, _name, _args, _fields) \ + LTTNG_UST_TRACEPOINT_EVENT_CLASS(_provider, _name, LTTNG_UST__TP_PARAMS(_args), \ + LTTNG_UST__TP_PARAMS(_fields)) \ + LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(_provider, _name, _name, \ + LTTNG_UST__TP_PARAMS(_args)) + + +#undef LTTNG_UST_TRACEPOINT_CREATE_PROBES +#if LTTNG_UST_COMPAT_API(0) #undef TRACEPOINT_CREATE_PROBES +#endif +#define LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ +#if LTTNG_UST_COMPAT_API(0) #define TRACEPOINT_HEADER_MULTI_READ - -/* - * LTTng-UST 2.0 expects TRACEPOINT_INCLUDE_FILE, but this approach has - * the unwanted side-effect of expanding any macro name found within - * TRACEPOINT_INCLUDE_FILE. - * - * Starting from LTTng-UST 2.1, we expect the TRACEPOINT_INCLUDE to be - * defined by probes as a string. We still check for - * TRACEPOINT_INCLUDE_FILE for API backward compatibility. - */ -#ifdef TRACEPOINT_INCLUDE_FILE -#define TRACEPOINT_INCLUDE __tp_stringify(TRACEPOINT_INCLUDE_FILE) #endif -#include TRACEPOINT_INCLUDE +#if LTTNG_UST_COMPAT_API(0) +# if defined(TRACEPOINT_INCLUDE) && !defined(LTTNG_UST_TRACEPOINT_INCLUDE) +# define LTTNG_UST_TRACEPOINT_INCLUDE TRACEPOINT_INCLUDE +# endif +#endif /* #if LTTNG_UST_COMPAT_API(0) */ + +#if LTTNG_UST_COMPAT_API(0) +# if defined(TRACEPOINT_PROVIDER) && !defined(LTTNG_UST_TRACEPOINT_PROVIDER) +# define LTTNG_UST_TRACEPOINT_PROVIDER TRACEPOINT_PROVIDER +# endif +#endif /* #if LTTNG_UST_COMPAT_API(0) */ + +#include LTTNG_UST_TRACEPOINT_INCLUDE #include +#undef LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ +#if LTTNG_UST_COMPAT_API(0) #undef TRACEPOINT_HEADER_MULTI_READ -#undef TRACEPOINT_INCLUDE_FILE -#undef TRACEPOINT_INCLUDE +#endif + +#undef LTTNG_UST_TRACEPOINT_INCLUDE +#if LTTNG_UST_COMPAT_API(0) +# undef TRACEPOINT_INCLUDE +#endif + +#define LTTNG_UST_TRACEPOINT_CREATE_PROBES + +/* + * Put back definitions to the state they were when defined by + * tracepoint.h. + */ +#undef LTTNG_UST_TP_ARGS +#define LTTNG_UST_TP_ARGS(...) __VA_ARGS__ + +#undef LTTNG_UST_TRACEPOINT_EVENT +#define LTTNG_UST_TRACEPOINT_EVENT(provider, name, args, fields) \ + LTTNG_UST__DECLARE_TRACEPOINT(provider, name, LTTNG_UST__TP_PARAMS(args)) \ + LTTNG_UST__DEFINE_TRACEPOINT(provider, name, LTTNG_UST__TP_PARAMS(args)) + +#undef LTTNG_UST_TRACEPOINT_EVENT_CLASS +#define LTTNG_UST_TRACEPOINT_EVENT_CLASS(provider, name, args, fields) + +#undef LTTNG_UST_TRACEPOINT_EVENT_INSTANCE +#define LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(provider, _template, name, args) \ + LTTNG_UST__DECLARE_TRACEPOINT(provider, name, LTTNG_UST__TP_PARAMS(args)) \ + LTTNG_UST__DEFINE_TRACEPOINT(provider, name, LTTNG_UST__TP_PARAMS(args)) + +#undef LTTNG_UST_TRACEPOINT_LOGLEVEL +#define LTTNG_UST_TRACEPOINT_LOGLEVEL(provider, name, loglevel) -#define TRACEPOINT_CREATE_PROBES +#undef LTTNG_UST_TRACEPOINT_MODEL_EMF_URI +#define LTTNG_UST_TRACEPOINT_MODEL_EMF_URI(provider, name, uri) -#endif /* TRACEPOINT_CREATE_PROBES */ +#endif /* LTTNG_UST_TRACEPOINT_CREATE_PROBES */