Refactor Java agent to let applications manage the log handlers

[deliverable/lttng-ust.git] / liblttng-ust-java-agent / jni / log4j / lttng_ust_log4j.c

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 c887f7f414e5602f0e72be0f543a261aeb4c838b..d5df70e2a18f5493fbcd2ec5167856e7415eecc2 100644 (file)
--- a/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c
+++ b/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "org_lttng_ust_agent_log4j_LTTngLogAppender.h"
+#include "org_lttng_ust_agent_log4j_LttngLogAppender.h"
 
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_CREATE_PROBES
@@ -25,7 +25,7 @@
 /*
  * System tracepoint meaning only root agent will fire this.
  */
-JNIEXPORT void JNICALL Java_org_lttng_ust_agent_log4j_LTTngLogAppender_tracepointS(JNIEnv *env,
+JNIEXPORT void JNICALL Java_org_lttng_ust_agent_log4j_LttngLogAppender_tracepoint(JNIEnv *env,
                                                jobject jobj,
                                                jstring msg,
                                                jstring logger_name,
@@ -45,6 +45,7 @@ JNIEXPORT void JNICALL Java_org_lttng_ust_agent_log4j_LTTngLogAppender_tracepoin
        const char *file_name_cstr = (*env)->GetStringUTFChars(env, file_name, &iscopy);
        const char *thread_name_cstr = (*env)->GetStringUTFChars(env, thread_name, &iscopy);
 
+       // FIXME Change "sys_event" to "event" once lttng-tools is updated
        tracepoint(lttng_log4j, sys_event, msg_cstr, logger_name_cstr,
                   class_name_cstr, method_name_cstr, file_name_cstr,
                   line_number, timestamp, loglevel, thread_name_cstr);
@@ -57,37 +58,3 @@ JNIEXPORT void JNICALL Java_org_lttng_ust_agent_log4j_LTTngLogAppender_tracepoin
        (*env)->ReleaseStringUTFChars(env, thread_name, thread_name_cstr);
 }
 
-/*
- * User tracepoint meaning only a non root agent will fire this.
- */
-JNIEXPORT void JNICALL Java_org_lttng_ust_agent_log4j_LTTngLogAppender_tracepointU(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)
-{
-       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);
-
-       tracepoint(lttng_log4j, user_event, msg_cstr, logger_name_cstr,
-                  class_name_cstr, method_name_cstr, file_name_cstr,
-                  line_number, timestamp, loglevel, thread_name_cstr);
-
-       (*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);
-}