X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-java-agent%2Fjni%2Fjul%2Flttng_ust_jul.h;h=b180f086e5dc47214aad6e683636fc2e62ab616c;hb=b4064f282fc27c80f17166b1439442d6ddd118b2;hp=398c14d459105054e79ea8ba098792b23cd1a1ab;hpb=efa14d169c6336fa8b9f478538ac7968ef9c0338;p=lttng-ust.git diff --git a/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h b/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h index 398c14d4..b180f086 100644 --- a/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h +++ b/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h @@ -4,10 +4,10 @@ * Copyright (C) 2011 Mathieu Desnoyers */ -#undef TRACEPOINT_PROVIDER -#define TRACEPOINT_PROVIDER lttng_jul +#undef LTTNG_UST_TRACEPOINT_PROVIDER +#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_jul -#if !defined(_TRACEPOINT_LTTNG_UST_JUL_H) || defined(TRACEPOINT_HEADER_MULTI_READ) +#if !defined(_TRACEPOINT_LTTNG_UST_JUL_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ) #define _TRACEPOINT_LTTNG_UST_JUL_H #include @@ -15,7 +15,7 @@ /* * Tracepoint used by Java applications using the JUL handler. */ -TRACEPOINT_EVENT(lttng_jul, event, +LTTNG_UST_TRACEPOINT_EVENT(lttng_jul, event, LTTNG_UST_TP_ARGS( const char *, msg, const char *, logger_name, @@ -29,16 +29,16 @@ TRACEPOINT_EVENT(lttng_jul, event, ctf_string(logger_name, logger_name) ctf_string(class_name, class_name) ctf_string(method_name, method_name) - ctf_integer(long, long_millis, millis) - ctf_integer(int, int_loglevel, log_level) - ctf_integer(int, int_threadid, thread_id) + lttng_ust_field_integer(long, long_millis, millis) + lttng_ust_field_integer(int, int_loglevel, log_level) + lttng_ust_field_integer(int, int_threadid, thread_id) ) ) #endif /* _TRACEPOINT_LTTNG_UST_JUL_H */ -#undef TRACEPOINT_INCLUDE -#define TRACEPOINT_INCLUDE "./lttng_ust_jul.h" +#undef LTTNG_UST_TRACEPOINT_INCLUDE +#define LTTNG_UST_TRACEPOINT_INCLUDE "./lttng_ust_jul.h" /* This part must be outside protection */ #include