Rename UST.class to LTTNG_UST.class

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/liblttng-ust-java/LTTNG_UST.c b/liblttng-ust-java/LTTNG_UST.c
new file mode 100644 (file)
index 0000000..e61c63b
--- /dev/null
+++ b/liblttng-ust-java/LTTNG_UST.c
@@ -0,0 +1,17 @@
+#include <jni.h>
+
+#define TRACEPOINT_CREATE_PROBES
+#include "lttng_ust_java.h"
+
+JNIEXPORT void JNICALL Java_LTTNG_UST_ust_1java_1event (JNIEnv *env,
+                                               jobject jobj,
+                                               jstring ev_name,
+                                               jstring args)
+{
+       jboolean iscopy;
+       const char *ev_name_cstr = (*env)->GetStringUTFChars(env, ev_name,
+                                                       &iscopy);
+       const char *args_cstr = (*env)->GetStringUTFChars(env, args, &iscopy);
+
+       tracepoint(lttng_ust_java_string, ev_name_cstr, args_cstr);
+}

diff --git a/liblttng-ust-java/LTTNG_UST.java b/liblttng-ust-java/LTTNG_UST.java
new file mode 100644 (file)
index 0000000..f6fcd4a
--- /dev/null
+++ b/liblttng-ust-java/LTTNG_UST.java
@@ -0,0 +1,9 @@
+import java.util.*;
+
+class LTTNG_UST {
+       public static native void lttng_ust_java_string(String name, String arg);
+       static {
+               System.loadLibrary("lttng-ust-java");
+       }
+}
+

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index fb25cb7bde49062698126cfe54c0ad76724787e5..d80343a62f6fa83ac25e08c6264bed1cee40a10a 100644 (file)
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -3,19 +3,19 @@ if BUILD_JNI_INTERFACE
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = liblttng-ust-java.la
-liblttng_ust_java_la_SOURCES = UST.c UST.h ust_java.h
-dist_noinst_DATA = UST.java
+liblttng_ust_java_la_SOURCES = LTTNG_UST.c LTTNG_UST.h lttng_ust_java.h
+dist_noinst_DATA = LTTNG_UST.java
 liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
 
-all: UST.class UST.h
+all: LTTNG_UST.class LTTNG_UST.h
 
 clean-local:
-       rm -rf UST.h UST.class
+       rm -rf LTTNG_UST.h LTTNG_UST.class
 
-UST.class: UST.java
-       javac -d "$(builddir)" "$(srcdir)/UST.java"
+LTTNG_UST.class: LTTNG_UST.java
+       javac -d "$(builddir)" "$(srcdir)/LTTNG_UST.java"
 
-UST.h: UST.class
-       javah -jni UST
+LTTNG_UST.h: LTTNG_UST.class
+       javah -jni LTTNG_UST
 
 endif

diff --git a/liblttng-ust-java/UST.c b/liblttng-ust-java/UST.c
deleted file mode 100644 (file)
index 7ad1c71..0000000
--- a/liblttng-ust-java/UST.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <jni.h>
-
-#define TRACEPOINT_CREATE_PROBES
-#include "ust_java.h"
-
-JNIEXPORT void JNICALL Java_UST_ust_1java_1event (JNIEnv *env, jobject jobj,
-                                               jstring ev_name, jstring args)
-{
-       jboolean iscopy;
-       const char *ev_name_cstr = (*env)->GetStringUTFChars(env, ev_name,
-                                                       &iscopy);
-       const char *args_cstr = (*env)->GetStringUTFChars(env, args, &iscopy);
-
-       tracepoint(ust_java_event, ev_name_cstr, args_cstr);
-}

diff --git a/liblttng-ust-java/UST.java b/liblttng-ust-java/UST.java
deleted file mode 100644 (file)
index be5f7c7..0000000
--- a/liblttng-ust-java/UST.java
+++ /dev/null
@@ -1,9 +0,0 @@
-import java.util.*;
-
-class UST {
-       public static native void ust_java_event(String name, String arg);
-       static {
-               System.loadLibrary("ustjava");
-       }
-}
-

diff --git a/liblttng-ust-java/lttng_ust_java.h b/liblttng-ust-java/lttng_ust_java.h
new file mode 100644 (file)
index 0000000..ccb6233
--- /dev/null
+++ b/liblttng-ust-java/lttng_ust_java.h
@@ -0,0 +1,44 @@
+#undef TRACEPOINT_SYSTEM
+#define TRACEPOINT_SYSTEM ust_java
+
+#if !defined(_TRACEPOINT_UST_JAVA_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define _TRACEPOINT_UST_JAVA_H
+
+/*
+ * Copyright (C) 2011  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; 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.
+ *
+ * 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
+ */
+
+#include <lttng/tracepoint.h>
+
+TRACEPOINT_EVENT(lttng_ust_java_string,
+       TP_PROTO(const char *name, const char *args),
+       TP_ARGS(name, args),
+       TP_FIELDS(
+               ctf_string(name, name)
+               ctf_string(args, args)
+       )
+)
+
+#endif /* _TRACEPOINT_UST_JAVA_H */
+
+#undef TRACEPOINT_INCLUDE_PATH
+#define TRACEPOINT_INCLUDE_PATH .
+#undef TRACEPOINT_INCLUDE_FILE
+#define TRACEPOINT_INCLUDE_FILE lttng_ust_java
+
+/* This part must be outside protection */
+#include <lttng/tracepoint-event.h>

diff --git a/liblttng-ust-java/ust_java.h b/liblttng-ust-java/ust_java.h
deleted file mode 100644 (file)
index 366b373..0000000
--- a/liblttng-ust-java/ust_java.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#undef TRACEPOINT_SYSTEM
-#define TRACEPOINT_SYSTEM ust_java
-
-#if !defined(_TRACEPOINT_UST_JAVA_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
-#define _TRACEPOINT_UST_JAVA_H
-
-/*
- * Copyright (C) 2011  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; 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.
- *
- * 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
- */
-
-#include <ust/tracepoint.h>
-
-TRACEPOINT_EVENT(ust_java_event,
-       TP_PROTO(const char *name, const char *args),
-       TP_ARGS(name, args),
-       TP_FIELDS(
-               ctf_string(name, name)
-               ctf_string(args, args)
-       )
-)
-
-#endif /* _TRACEPOINT_UST_JAVA_H */
-
-#undef TRACEPOINT_INCLUDE_PATH
-#define TRACEPOINT_INCLUDE_PATH .
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ust_java
-
-/* This part must be outside protection */
-#include <ust/tracepoint-event.h>