X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-event.h;h=f97b67d1eb9dfbbea6f67c33c3e14f766227f372;hb=dbcc2f9279a03c620350b4743467aa2f7cb7bf5f;hp=938184552f928cafe3311259754825799692feda;hpb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;p=lttng-ust.git diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h index 93818455..f97b67d1 100644 --- a/include/lttng/tracepoint-event.h +++ b/include/lttng/tracepoint-event.h @@ -9,40 +9,26 @@ #define __tp_stringify1(x) #x #define __tp_stringify(x) __tp_stringify1(x) -#undef TRACEPOINT_EVENT_INSTANCE -#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) +#undef LTTNG_UST_TRACEPOINT_EVENT_INSTANCE +#define LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) -#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)) +#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 TRACEPOINT_CREATE_PROBES #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 #include #undef TRACEPOINT_HEADER_MULTI_READ -#undef TRACEPOINT_INCLUDE_FILE #undef TRACEPOINT_INCLUDE #define TRACEPOINT_CREATE_PROBES @@ -51,26 +37,26 @@ * Put back definitions to the state they were when defined by * tracepoint.h. */ -#undef TP_ARGS -#define TP_ARGS(...) __VA_ARGS__ +#undef LTTNG_UST_TP_ARGS +#define LTTNG_UST_TP_ARGS(...) __VA_ARGS__ -#undef TRACEPOINT_EVENT -#define TRACEPOINT_EVENT(provider, name, args, fields) \ - _DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args)) \ - _DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(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 TRACEPOINT_EVENT_CLASS -#define TRACEPOINT_EVENT_CLASS(provider, name, args, fields) +#undef LTTNG_UST_TRACEPOINT_EVENT_CLASS +#define LTTNG_UST_TRACEPOINT_EVENT_CLASS(provider, name, args, fields) -#undef TRACEPOINT_EVENT_INSTANCE -#define TRACEPOINT_EVENT_INSTANCE(provider, _template, name, args) \ - _DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args)) \ - _DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(args)) +#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 TRACEPOINT_LOGLEVEL -#define TRACEPOINT_LOGLEVEL(provider, name, loglevel) +#undef LTTNG_UST_TRACEPOINT_LOGLEVEL +#define LTTNG_UST_TRACEPOINT_LOGLEVEL(provider, name, loglevel) -#undef TRACEPOINT_MODEL_EMF_URI -#define TRACEPOINT_MODEL_EMF_URI(provider, name, uri) +#undef LTTNG_UST_TRACEPOINT_MODEL_EMF_URI +#define LTTNG_UST_TRACEPOINT_MODEL_EMF_URI(provider, name, uri) #endif /* TRACEPOINT_CREATE_PROBES */