X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjni%2Flog4j%2Flttng_ust_log4j.c;h=ff7395c8ce8db8f4102fbdcc15cfc9c5057960fc;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=3b78c8e5911f6845b4836ed1cb1e5b38354c8812;hpb=6e7bc9e0a5346b2dde6d9d5d72e0d2bf3a073f54;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..ff7395c8 100644
--- a/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c
+++ b/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c
@@ -1,29 +1,21 @@
 /*
- * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Copyright (C) 2016 EfficiOS Inc.
+ * Copyright (C) 2016 Alexandre Montplaisir <alexmonthy@efficios.com>
+ * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
+#define _LGPL_SOURCE
 #include "org_lttng_ust_agent_log4j_LttngLog4jApi.h"
 
 #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 +49,58 @@ 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_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);
+	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_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_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_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)->ReleaseStringUTFChars(env, file_name, file_name_cstr);
+	(*env)->ReleaseStringUTFChars(env, thread_name, thread_name_cstr);
+	(*env)->ReleaseByteArrayElements(env, context_info_entries, context_info_entries_array, 0);
+	(*env)->ReleaseByteArrayElements(env, context_info_strings, context_info_strings_array, 0);
+}