X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-event.h;h=9d757940d381a63b1ad8efd52562a893aa2de5b2;hb=67e5f39161d80ea3d972a37ecf76f45a260c480d;hp=b47bf6a7b4efe3007125bd9ce3f7bc537b073c37;hpb=1909f468edb241b4dc84d8327efa3a3e3bc319da;p=lttng-ust.git diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h index b47bf6a7..9d757940 100644 --- a/include/lttng/tracepoint-event.h +++ b/include/lttng/tracepoint-event.h @@ -1,53 +1,14 @@ /* - * 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. + * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED + * OR IMPLIED. ANY USE IS AT YOUR OWN RISK. * - * 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. - * - * 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. - * - * Note considering licensing: - * - * Including the tracepoint-event.h header without the - * TRACEPOINT_CREATE_PROBES macro defined is fine within any application - * source code, even for non-LGPL-compatible applications. - * - * However, TRACEPOINT_CREATE_PROBES should only be defined within - * LGPL-compatible C files. This means that the tracepoint probe object - * should be relinkable when distributed, either by providing it as a - * dynamically linkable shared object (.so library), or by providing the - * build scripts and object files required to relink the object if - * statically linked. + * Permission is hereby granted to use or copy this program + * for any purpose, provided the above notices are retained on all copies. + * Permission to modify the code and to distribute modified code is granted, + * provided the above notices are retained, and a notice that the code was + * modified is included with the above copyright notice. */ #ifdef __cplusplus @@ -56,68 +17,34 @@ extern "C" { #ifdef TRACEPOINT_CREATE_PROBES -/* Prevent recursion */ -#undef TRACEPOINT_CREATE_PROBES - -#ifndef __tp_stringify -#define __tp_stringify_1(x...) #x -#define __tp_stringify(x...) __tp_stringify_1(x) -#endif - -#undef TRACEPOINT_EVENT -#define TRACEPOINT_EVENT(provider, name, args, fields) \ - _DEFINE_TRACEPOINT(provider, name) +#define __tp_stringify1(x) #x +#define __tp_stringify(x) __tp_stringify1(x) #undef TRACEPOINT_EVENT_INSTANCE -#define TRACEPOINT_EVENT_INSTANCE(provider, template, name, args) \ - _DEFINE_TRACEPOINT(provider, name) +#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args) -#undef TRACEPOINT_INCLUDE -#undef __TRACEPOINT_INCLUDE - -#ifndef TRACEPOINT_INCLUDE_FILE -# define TRACEPOINT_INCLUDE_FILE TRACEPOINT_PROVIDER -# define UNDEF_TRACEPOINT_INCLUDE_FILE -#endif +#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)) -#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) -#endif +#define TRACEPOINT_INCLUDE __tp_stringify(TRACEPOINT_INCLUDE_FILE) -# define TRACEPOINT_INCLUDE(provider) __TRACEPOINT_INCLUDE(provider) +#undef TRACEPOINT_CREATE_PROBES -/* 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 -/* 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 +#ifdef __cplusplus } #endif