X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint.h;h=b637b8534eb83b67ef8ded57c16b0adf99e3938a;hb=5b393d6424d959e2efbb800b0c8a61b81bf9968e;hp=043426fce78e580806e5446e12fa4945e7b652a0;hpb=88c7c4eacbd4a98ad8e5df341ae2f1223b735194;p=lttng-ust.git diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h index 043426fc..b637b853 100644 --- a/include/lttng/tracepoint.h +++ b/include/lttng/tracepoint.h @@ -597,7 +597,7 @@ lttng_ust__tracepoints__ptrs_destroy(void) /* The following declarations must be outside re-inclusion protection. */ -#ifndef TRACEPOINT_ENUM +#ifndef LTTNG_UST_TRACEPOINT_ENUM /* * Tracepoint Enumerations @@ -608,7 +608,7 @@ lttng_ust__tracepoints__ptrs_destroy(void) * * An example: * - * TRACEPOINT_ENUM(someproject_component, enumname, + * LTTNG_UST_TRACEPOINT_ENUM(someproject_component, enumname, * TP_ENUM_VALUES( * ctf_enum_value("even", 0) * ctf_enum_value("uneven", 1) @@ -632,14 +632,18 @@ lttng_ust__tracepoints__ptrs_destroy(void) * ctf_enum(someproject_component, enumname, enumtype, enumfield, enumval) * * Where "someproject_component" and "enumname" match those in the - * TRACEPOINT_ENUM, "enumtype" is a signed or unsigned integer type + * LTTNG_UST_TRACEPOINT_ENUM, "enumtype" is a signed or unsigned integer type * backing the enumeration, "enumfield" is the name of the field and * "enumval" is the value. */ -#define TRACEPOINT_ENUM(provider, name, values) +#define LTTNG_UST_TRACEPOINT_ENUM(provider, name, values) -#endif /* #ifndef TRACEPOINT_ENUM */ +#if LTTNG_UST_COMPAT_API(0) +#define TRACEPOINT_ENUM LTTNG_UST_TRACEPOINT_ENUM +#endif /* #if LTTNG_UST_COMPAT_API(0) */ + +#endif /* #ifndef LTTNG_UST_TRACEPOINT_ENUM */ #ifndef LTTNG_UST_TRACEPOINT_EVENT @@ -743,7 +747,7 @@ lttng_ust__tracepoints__ptrs_destroy(void) #endif /* #ifndef LTTNG_UST_TRACEPOINT_EVENT */ -#ifndef TRACEPOINT_LOGLEVEL +#ifndef LTTNG_UST_TRACEPOINT_LOGLEVEL /* * Tracepoint Loglevels @@ -757,88 +761,112 @@ lttng_ust__tracepoints__ptrs_destroy(void) * semantic. Loglevels 7 through 13 offer more fine-grained selection of * debug information. * - * TRACE_EMERG 0 + * LTTNG_UST_TRACEPOINT_LOGLEVEL_EMERG 0 * system is unusable * - * TRACE_ALERT 1 + * LTTNG_UST_TRACEPOINT_LOGLEVEL_ALERT 1 * action must be taken immediately * - * TRACE_CRIT 2 + * LTTNG_UST_TRACEPOINT_LOGLEVEL_CRIT 2 * critical conditions * - * TRACE_ERR 3 + * LTTNG_UST_TRACEPOINT_LOGLEVEL_ERR 3 * error conditions * - * TRACE_WARNING 4 + * LTTNG_UST_TRACEPOINT_LOGLEVEL_WARNING 4 * warning conditions * - * TRACE_NOTICE 5 + * LTTNG_UST_TRACEPOINT_LOGLEVEL_NOTICE 5 * normal, but significant, condition * - * TRACE_INFO 6 + * LTTNG_UST_TRACEPOINT_LOGLEVEL_INFO 6 * informational message * - * TRACE_DEBUG_SYSTEM 7 + * LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_SYSTEM 7 * debug information with system-level scope (set of programs) * - * TRACE_DEBUG_PROGRAM 8 + * LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROGRAM 8 * debug information with program-level scope (set of processes) * - * TRACE_DEBUG_PROCESS 9 + * LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROCESS 9 * debug information with process-level scope (set of modules) * - * TRACE_DEBUG_MODULE 10 + * LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_MODULE 10 * debug information with module (executable/library) scope (set of units) * - * TRACE_DEBUG_UNIT 11 + * LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_UNIT 11 * debug information with compilation unit scope (set of functions) * - * TRACE_DEBUG_FUNCTION 12 + * LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_FUNCTION 12 * debug information with function-level scope * - * TRACE_DEBUG_LINE 13 + * LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_LINE 13 * debug information with line-level scope (LTTNG_UST_TRACEPOINT_EVENT default) * - * TRACE_DEBUG 14 + * LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG 14 * debug-level message * * Declare tracepoint loglevels for tracepoints. A LTTNG_UST_TRACEPOINT_EVENT - * should be declared prior to the the TRACEPOINT_LOGLEVEL for a given + * should be declared prior to the the LTTNG_UST_TRACEPOINT_LOGLEVEL for a given * tracepoint name. The first field is the provider name, the second * field is the name of the tracepoint, the third field is the loglevel * name. * - * TRACEPOINT_LOGLEVEL(< [com_company_]project[_component] >, < event >, + * LTTNG_UST_TRACEPOINT_LOGLEVEL(< [com_company_]project[_component] >, < event >, * < loglevel_name >) * - * The TRACEPOINT_PROVIDER must be already declared before declaring a - * TRACEPOINT_LOGLEVEL. + * The LTTNG_UST_TRACEPOINT_PROVIDER must be already declared before declaring a + * LTTNG_UST_TRACEPOINT_LOGLEVEL. */ enum { - TRACE_EMERG = 0, - TRACE_ALERT = 1, - TRACE_CRIT = 2, - TRACE_ERR = 3, - TRACE_WARNING = 4, - TRACE_NOTICE = 5, - TRACE_INFO = 6, - TRACE_DEBUG_SYSTEM = 7, - TRACE_DEBUG_PROGRAM = 8, - TRACE_DEBUG_PROCESS = 9, - TRACE_DEBUG_MODULE = 10, - TRACE_DEBUG_UNIT = 11, - TRACE_DEBUG_FUNCTION = 12, - TRACE_DEBUG_LINE = 13, - TRACE_DEBUG = 14, + LTTNG_UST_TRACEPOINT_LOGLEVEL_EMERG = 0, + LTTNG_UST_TRACEPOINT_LOGLEVEL_ALERT = 1, + LTTNG_UST_TRACEPOINT_LOGLEVEL_CRIT = 2, + LTTNG_UST_TRACEPOINT_LOGLEVEL_ERR = 3, + LTTNG_UST_TRACEPOINT_LOGLEVEL_WARNING = 4, + LTTNG_UST_TRACEPOINT_LOGLEVEL_NOTICE = 5, + LTTNG_UST_TRACEPOINT_LOGLEVEL_INFO = 6, + LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_SYSTEM = 7, + LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROGRAM = 8, + LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROCESS = 9, + LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_MODULE = 10, + LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_UNIT = 11, + LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_FUNCTION = 12, + LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_LINE = 13, + LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG = 14, }; -#define TRACEPOINT_LOGLEVEL(provider, name, loglevel) +#define LTTNG_UST_TRACEPOINT_LOGLEVEL(provider, name, loglevel) -#endif /* #ifndef TRACEPOINT_LOGLEVEL */ +#if LTTNG_UST_COMPAT_API(0) +#define TRACEPOINT_LOGLEVEL LTTNG_UST_TRACEPOINT_LOGLEVEL + +#define TRACE_EMERG LTTNG_UST_TRACEPOINT_LOGLEVEL_EMERG +#define TRACE_ALERT LTTNG_UST_TRACEPOINT_LOGLEVEL_ALERT +#define TRACE_CRIT LTTNG_UST_TRACEPOINT_LOGLEVEL_CRIT +#define TRACE_ERR LTTNG_UST_TRACEPOINT_LOGLEVEL_ERR +#define TRACE_WARNING LTTNG_UST_TRACEPOINT_LOGLEVEL_WARNING +#define TRACE_NOTICE LTTNG_UST_TRACEPOINT_LOGLEVEL_NOTICE +#define TRACE_INFO LTTNG_UST_TRACEPOINT_LOGLEVEL_INFO +#define TRACE_DEBUG_SYSTEM LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_SYSTEM +#define TRACE_DEBUG_PROGRAM LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROGRAM +#define TRACE_DEBUG_PROCESS LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROCESS +#define TRACE_DEBUG_MODULE LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_MODULE +#define TRACE_DEBUG_UNIT LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_UNIT +#define TRACE_DEBUG_FUNCTION LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_FUNCTION +#define TRACE_DEBUG_LINE LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_LINE +#define TRACE_DEBUG LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG +#endif -#ifndef TRACEPOINT_MODEL_EMF_URI +#endif /* #ifndef LTTNG_UST_TRACEPOINT_LOGLEVEL */ -#define TRACEPOINT_MODEL_EMF_URI(provider, name, uri) +#ifndef LTTNG_UST_TRACEPOINT_MODEL_EMF_URI + +#define LTTNG_UST_TRACEPOINT_MODEL_EMF_URI(provider, name, uri) + +#if LTTNG_UST_COMPAT_API(0) +#define TRACEPOINT_MODEL_EMF_URI LTTNG_UST_TRACEPOINT_MODEL_EMF_URI +#endif -#endif /* #ifndef TRACEPOINT_MODEL_EMF_URI */ +#endif /* #ifndef LTTNG_UST_TRACEPOINT_MODEL_EMF_URI */