java: fixes

diff --git a/java/Makefile.am b/java/Makefile.am
index fa536287827edd13db88a8bc8d0209309a92ba7e..82199f98783ac1530c4ffe9c80dec801d9b3a422 100644 (file)
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -5,7 +5,7 @@ libustjava_la_SOURCES = UST.c UST.h
 noinst_DATA = UST.java
 libustjava_la_LIBADD = -lc -L$(top_builddir)/libust/.libs -lust
 
 noinst_DATA = UST.java
 libustjava_la_LIBADD = -lc -L$(top_builddir)/libust/.libs -lust
 

-all: UST.class
+all: UST.class UST.h

 
 clean-local:
        rm -rf UST.h UST.class
 
 clean-local:
        rm -rf UST.h UST.class


@@ -13,3 +13,5 @@ clean-local:
 UST.class: UST.java
        javac UST.java
 
 UST.class: UST.java
        javac UST.java
 

+UST.h:
+       javah -jni UST

diff --git a/java/UST.c b/java/UST.c
new file mode 100644 (file)
index 0000000..7c80772
--- /dev/null
+++ b/java/UST.c
@@ -0,0 +1,13 @@
+#include <jni.h>
+#include <ust/marker.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);
+
+       trace_mark(ust, java_event, "name %s args %s", ev_name_cstr, args_cstr);
+}
+
+MARKER_LIB