X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjni%2Flog4j%2Flttng_ust_log4j.c;h=b80312e2d3c72f6379d9d60d82ed8407fceeb9b4;hb=8ab5c06b92ac9a06ba2743470a38e4e1cfc6a3c9;hp=3b78c8e5911f6845b4836ed1cb1e5b38354c8812;hpb=1d193914f13dd604d60df9db680001c9a4af5f9d;p=lttng-ust.git

diff --git a/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c b/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c
index 3b78c8e5..b80312e2 100644
--- a/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c
+++ b/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.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
@@ -21,9 +22,10 @@
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_CREATE_PROBES
 #include "lttng_ust_log4j.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_log4j_LttngLog4jApi_tracepoint(JNIEnv *env,
 						jobject jobj,
@@ -57,3 +59,50 @@ JNIEXPORT void JNICALL Java_org_lttng_ust_agent_log4j_LttngLog4jApi_tracepoint(J
 	(*env)->ReleaseStringUTFChars(env, thread_name, thread_name_cstr);
 }
 
+/*
+ * Tracepoint used by Java applications using the log4j handler.
+ */
+JNIEXPORT void JNICALL Java_org_lttng_ust_agent_log4j_LttngLog4jApi_tracepointWithContext(JNIEnv *env,
+						jobject jobj,
+						jstring msg,
+						jstring logger_name,
+						jstring class_name,
+						jstring method_name,
+						jstring file_name,
+						jint line_number,
+						jlong timestamp,
+						jint loglevel,
+						jstring thread_name,
+						jbyteArray context_info)
+{
+	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);
+	const char *file_name_cstr = (*env)->GetStringUTFChars(env, file_name, &iscopy);
+	const char *thread_name_cstr = (*env)->GetStringUTFChars(env, thread_name, &iscopy);
+	signed char *context_info_array;
+
+	/*
+	 * Write these to the TLS variables, so that the UST callbacks in
+	 * lttng_ust_context.c can access them.
+	 */
+	context_info_array = (*env)->GetByteArrayElements(env, context_info, &iscopy);
+	lttng_ust_context_info_tls.ctx = (struct lttng_ust_jni_ctx *) context_info_array;
+	lttng_ust_context_info_tls.len = (*env)->GetArrayLength(env, context_info);
+
+	tracepoint(lttng_log4j, event, msg_cstr, logger_name_cstr,
+		   class_name_cstr, method_name_cstr, file_name_cstr,
+		   line_number, timestamp, loglevel, thread_name_cstr);
+
+	lttng_ust_context_info_tls.ctx = NULL;
+	lttng_ust_context_info_tls.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)->ReleaseStringUTFChars(env, file_name, file_name_cstr);
+	(*env)->ReleaseStringUTFChars(env, thread_name, thread_name_cstr);
+	(*env)->ReleaseByteArrayElements(env, context_info, context_info_array, 0);
+}