X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-event.h;h=c1ca31c85e11a64d0f5b0b5080e08282a06cec58;hb=cc2ba9135cafdcfc8cc1354ebed5db7fb5279358;hp=e7ea461bcdb87dfd6cdb17673cf9712f8cb8b3fa;hpb=63ef26930fe613a266cc69f5089cf643dd59b012;p=lttng-ust.git diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h index e7ea461b..c1ca31c8 100644 --- a/include/lttng/tracepoint-event.h +++ b/include/lttng/tracepoint-event.h @@ -1,110 +1,66 @@ /* - * Copyright (C) 2009 Steven Rostedt - * Copyright (C) 2011 Mathieu Desnoyers + * Copyright (c) 2011 - Mathieu Desnoyers * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License. + * 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: * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * - * Trace files that want to automate creationg of all tracepoints defined - * in their file should include this file. The following are macros that the - * trace file may define: - * - * TRACEPOINT_PROVIDER defines the provider the tracepoint is for: - * < [com_company_]project_[component_] > - * - * TRACEPOINT_INCLUDE_FILE if the file name is something other than - * TRACEPOINT_PROVIDER.h. This macro may be defined to tell - * define_trace.h what file to include. Note, leave off the ".h". - * - * TRACEPOINT_INCLUDE_PATH if the path is something other than within - * the system's include/tracepoint/ path, then this macro can define - * the path to use. This path is relative to tracepoint-event.h, or - * to the include search path. Trick: Use a - * #define TRACEPOINT_INCLUDE_PATH . - * combined with -Ipath_to_header as compiler argument to allow - * searching for a header within your project build tree. + * 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. */ -#ifdef __cplusplus -extern "C" { -#endif - #ifdef TRACEPOINT_CREATE_PROBES -/* Prevent recursion */ -#undef TRACEPOINT_CREATE_PROBES +#define __tp_stringify1(x) #x +#define __tp_stringify(x) __tp_stringify1(x) -#ifndef __tp_stringify -#define __tp_stringify_1(x...) #x -#define __tp_stringify(x...) __tp_stringify_1(x) -#endif +#undef TRACEPOINT_EVENT_INSTANCE +#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) #undef TRACEPOINT_EVENT -#define TRACEPOINT_EVENT(provider, name, args, fields) \ - _DEFINE_TRACEPOINT(provider, name) +#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 TRACEPOINT_EVENT_INSTANCE -#define TRACEPOINT_EVENT_INSTANCE(provider, template, name, args) \ - _DEFINE_TRACEPOINT(provider, name) -#undef TRACEPOINT_INCLUDE -#undef __TRACEPOINT_INCLUDE +#undef TRACEPOINT_CREATE_PROBES -#ifndef TRACEPOINT_INCLUDE_FILE -# define TRACEPOINT_INCLUDE_FILE TRACEPOINT_PROVIDER -# define UNDEF_TRACEPOINT_INCLUDE_FILE -#endif +#define TRACEPOINT_HEADER_MULTI_READ -#ifndef TRACEPOINT_INCLUDE_PATH -# define __TRACEPOINT_INCLUDE(provider) -# define UNDEF_TRACEPOINT_INCLUDE_PATH -#else -# define __TRACEPOINT_INCLUDE(provider) \ - __tp_stringify(TRACEPOINT_INCLUDE_PATH/provider.h) +/* + * 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 -# define TRACEPOINT_INCLUDE(provider) __TRACEPOINT_INCLUDE(provider) - -/* Let the trace headers be reread */ -#define TRACEPOINT_HEADER_MULTI_READ - -#include TRACEPOINT_INCLUDE(TRACEPOINT_INCLUDE_FILE) +#include TRACEPOINT_INCLUDE #include -#undef TRACEPOINT_EVENT -#undef TRACEPOINT_EVENT_CLASS -#undef TRACEPOINT_EVENT_INSTANCE #undef TRACEPOINT_HEADER_MULTI_READ +#undef TRACEPOINT_INCLUDE_FILE +#undef TRACEPOINT_INCLUDE -/* Only undef what we defined in this file */ -#ifdef UNDEF_TRACEPOINT_INCLUDE_FILE -# undef TRACEPOINT_INCLUDE_FILE -# undef UNDEF_TRACEPOINT_INCLUDE_FILE -#endif - -#ifdef UNDEF_TRACEPOINT_INCLUDE_PATH -# undef TRACEPOINT_INCLUDE_PATH -# undef UNDEF_TRACEPOINT_INCLUDE_PATH -#endif - -/* We may be processing more files */ #define TRACEPOINT_CREATE_PROBES #endif /* TRACEPOINT_CREATE_PROBES */ - -#ifdef __cplusplus -} -#endif