Good catch, incorrect fix. Only the C file needs the "DEFINE_URCU_TLS_IE". The headers were fine with DECLARE_URCU_TLS.
I spinned my own version of the fix. Thanks! Mathieu ----- On Oct 20, 2017, at 11:48 PM, Michael Jeanson [email protected] wrote: > Signed-off-by: Michael Jeanson <[email protected]> > --- > liblttng-ust-java-agent/jni/common/lttng_ust_context.c | 2 +- > liblttng-ust-java-agent/jni/common/lttng_ust_context.h | 2 +- > libringbuffer/frontend_internal.h | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/liblttng-ust-java-agent/jni/common/lttng_ust_context.c > b/liblttng-ust-java-agent/jni/common/lttng_ust_context.c > index e9b6da2..e4e000a 100644 > --- a/liblttng-ust-java-agent/jni/common/lttng_ust_context.c > +++ b/liblttng-ust-java-agent/jni/common/lttng_ust_context.c > @@ -57,7 +57,7 @@ struct lttng_ust_jni_ctx_entry { > } __attribute__((packed)); > > /* TLS passing context info from JNI to callbacks. */ > -DECLARE_URCU_TLS_IE(struct lttng_ust_jni_tls, lttng_ust_context_info_tls); > +DEFINE_URCU_TLS_IE(struct lttng_ust_jni_tls, lttng_ust_context_info_tls); > > static const char *get_ctx_string_at_offset(int32_t offset) > { > diff --git a/liblttng-ust-java-agent/jni/common/lttng_ust_context.h > b/liblttng-ust-java-agent/jni/common/lttng_ust_context.h > index 8ea43e1..77f6f80 100644 > --- a/liblttng-ust-java-agent/jni/common/lttng_ust_context.h > +++ b/liblttng-ust-java-agent/jni/common/lttng_ust_context.h > @@ -30,6 +30,6 @@ struct lttng_ust_jni_tls { > int32_t ctx_strings_len; > }; > > -extern DECLARE_URCU_TLS(struct lttng_ust_jni_tls, > lttng_ust_context_info_tls); > +extern DEFINE_URCU_TLS(struct lttng_ust_jni_tls, lttng_ust_context_info_tls); > > #endif /* LIBLTTNG_UST_JAVA_AGENT_JNI_COMMON_LTTNG_UST_CONTEXT_H_ */ > diff --git a/libringbuffer/frontend_internal.h > b/libringbuffer/frontend_internal.h > index 323a8df..5102777 100644 > --- a/libringbuffer/frontend_internal.h > +++ b/libringbuffer/frontend_internal.h > @@ -331,6 +331,6 @@ extern void lib_ring_buffer_free(struct > lttng_ust_lib_ring_buffer *buf, > struct lttng_ust_shm_handle *handle); > > /* Keep track of trap nesting inside ring buffer code */ > -extern DECLARE_URCU_TLS(unsigned int, lib_ring_buffer_nesting); > +extern DEFINE_URCU_TLS(unsigned int, lib_ring_buffer_nesting); > > #endif /* _LTTNG_RING_BUFFER_FRONTEND_INTERNAL_H */ > -- > 2.7.4 -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
