X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjni%2Fjul%2Flttng_ust_jul.c;h=562da6ba2a42c97e7e2d03b3983897f52c7b8351;hb=24a39530da763d983bd7006855b39967ff52ba13;hp=b089fe3b3ce179610ceaafefb7c2d10269ac4537;hpb=501f6777610d7f8d855453c0083a10912d5fac4b;p=lttng-ust.git

diff --git a/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c b/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c
index b089fe3b..562da6ba 100644
--- a/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c
+++ b/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2016 - EfficiOS Inc., Alexandre Montplaisir <alexmonthy@efficios.com>
  * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This library is free software; you can redistribute it and/or
@@ -16,16 +17,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "org_lttng_ust_agent_jul_LTTngLogHandler.h"
+#include "org_lttng_ust_agent_jul_LttngJulApi.h"
 
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_CREATE_PROBES
 #include "lttng_ust_jul.h"
+#include "../common/lttng_ust_context.h"
 
 /*
- * System tracepoint meaning only root agent will fire this.
+ * Deprecated function from before the context information was passed.
  */
-JNIEXPORT void JNICALL Java_org_lttng_ust_agent_jul_LTTngLogHandler_tracepointS(JNIEnv *env,
+JNIEXPORT void JNICALL Java_org_lttng_ust_agent_jul_LttngJulApi_tracepoint(JNIEnv *env,
 						jobject jobj,
 						jstring msg,
 						jstring logger_name,
@@ -41,7 +43,7 @@ JNIEXPORT void JNICALL Java_org_lttng_ust_agent_jul_LTTngLogHandler_tracepointS(
 	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, sys_event, msg_cstr, logger_name_cstr,
+	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);
@@ -51,29 +53,50 @@ JNIEXPORT void JNICALL Java_org_lttng_ust_agent_jul_LTTngLogHandler_tracepointS(
 }
 
 /*
- * User tracepoint meaning only a non root agent will fire this.
+ * Tracepoint used by Java applications using the JUL handler.
  */
-JNIEXPORT void JNICALL Java_org_lttng_ust_agent_jul_LTTngLogHandler_tracepointU(JNIEnv *env,
-		jobject jobj,
-		jstring msg,
-		jstring logger_name,
-		jstring class_name,
-		jstring method_name,
-		jlong millis,
-		jint log_level,
-		jint thread_id)
+JNIEXPORT void JNICALL Java_org_lttng_ust_agent_jul_LttngJulApi_tracepointWithContext(JNIEnv *env,
+						jobject jobj,
+						jstring msg,
+						jstring logger_name,
+						jstring class_name,
+						jstring method_name,
+						jlong millis,
+						jint log_level,
+						jint thread_id,
+						jbyteArray context_info_entries,
+						jbyteArray context_info_strings)
 {
 	jboolean iscopy;
 	const char *msg_cstr = (*env)->GetStringUTFChars(env, msg, &iscopy);
 	const char *logger_name_cstr = (*env)->GetStringUTFChars(env, logger_name, &iscopy);
 	const char *class_name_cstr = (*env)->GetStringUTFChars(env, class_name, &iscopy);
 	const char *method_name_cstr = (*env)->GetStringUTFChars(env, method_name, &iscopy);
+	signed char *context_info_entries_array;
+	signed char *context_info_strings_array;
+
+	/*
+	 * Write these to the TLS variables, so that the UST callbacks in
+	 * lttng_ust_context.c can access them.
+	 */
+	context_info_entries_array = (*env)->GetByteArrayElements(env, context_info_entries, &iscopy);
+	lttng_ust_context_info_tls.ctx_entries = (struct lttng_ust_jni_ctx_entry *) context_info_entries_array;
+	lttng_ust_context_info_tls.ctx_entries_len = (*env)->GetArrayLength(env, context_info_entries);
+	context_info_strings_array = (*env)->GetByteArrayElements(env, context_info_strings, &iscopy);
+	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, user_event, msg_cstr, logger_name_cstr,
+	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;
+	lttng_ust_context_info_tls.ctx_entries_len = 0;
+	lttng_ust_context_info_tls.ctx_strings = NULL;
+	lttng_ust_context_info_tls.ctx_strings_len = 0;
 	(*env)->ReleaseStringUTFChars(env, msg, msg_cstr);
 	(*env)->ReleaseStringUTFChars(env, logger_name, logger_name_cstr);
 	(*env)->ReleaseStringUTFChars(env, class_name, class_name_cstr);
 	(*env)->ReleaseStringUTFChars(env, method_name, method_name_cstr);
+	(*env)->ReleaseByteArrayElements(env, context_info_entries, context_info_entries_array, 0);
+	(*env)->ReleaseByteArrayElements(env, context_info_strings, context_info_strings_array, 0);
 }