projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: Fix abi conflict test when building with clang
[lttng-ust.git]
/
src
/
lib
/
lttng-ust-java-agent
/
jni
/
jul
/
lttng_ust_jul.c
diff --git
a/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.c
b/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.c
index afc9f1119ba68a3c488e2a58a122178bcd65da51..86c8852b3c6c8506de372ddeead5c1d4c0783227 100644
(file)
--- a/
src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.c
+++ b/
src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.c
@@
-9,8
+9,11
@@
#define _LGPL_SOURCE
#include "org_lttng_ust_agent_jul_LttngJulApi.h"
#define _LGPL_SOURCE
#include "org_lttng_ust_agent_jul_LttngJulApi.h"
-#define TRACEPOINT_DEFINE
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_HIDDEN_DEFINITION
+#define LTTNG_UST_TRACEPOINT_PROVIDER_HIDDEN_DEFINITION
+
+#define LTTNG_UST_TRACEPOINT_DEFINE
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
#include "lttng_ust_jul.h"
#include "../common/lttng_ust_context.h"
#include "lttng_ust_jul.h"
#include "../common/lttng_ust_context.h"
@@
-33,7
+36,7
@@
JNIEXPORT void JNICALL Java_org_lttng_ust_agent_jul_LttngJulApi_tracepoint(JNIEn
const char *class_name_cstr = (*env)->GetStringUTFChars(env, class_name, &iscopy);
const char *method_name_cstr = (*env)->GetStringUTFChars(env, method_name, &iscopy);
const char *class_name_cstr = (*env)->GetStringUTFChars(env, class_name, &iscopy);
const char *method_name_cstr = (*env)->GetStringUTFChars(env, method_name, &iscopy);
- tracepoint(lttng_jul, event, msg_cstr, logger_name_cstr,
+
lttng_ust_
tracepoint(lttng_jul, event, msg_cstr, logger_name_cstr,
class_name_cstr, method_name_cstr, millis, log_level, thread_id);
(*env)->ReleaseStringUTFChars(env, msg, msg_cstr);
class_name_cstr, method_name_cstr, millis, log_level, thread_id);
(*env)->ReleaseStringUTFChars(env, msg, msg_cstr);
@@
-76,7
+79,7
@@
JNIEXPORT void JNICALL Java_org_lttng_ust_agent_jul_LttngJulApi_tracepointWithCo
lttng_ust_context_info_tls.ctx_strings = context_info_strings_array;
lttng_ust_context_info_tls.ctx_strings_len = (*env)->GetArrayLength(env, context_info_strings);
lttng_ust_context_info_tls.ctx_strings = context_info_strings_array;
lttng_ust_context_info_tls.ctx_strings_len = (*env)->GetArrayLength(env, context_info_strings);
- tracepoint(lttng_jul, event, msg_cstr, logger_name_cstr,
+
lttng_ust_
tracepoint(lttng_jul, event, msg_cstr, logger_name_cstr,
class_name_cstr, method_name_cstr, millis, log_level, thread_id);
lttng_ust_context_info_tls.ctx_entries = NULL;
class_name_cstr, method_name_cstr, millis, log_level, thread_id);
lttng_ust_context_info_tls.ctx_entries = NULL;
This page took
0.057958 seconds
and
4
git commands to generate.