From: Mathieu Desnoyers Date: Wed, 18 Apr 2012 23:05:32 +0000 (-0400) Subject: Revert "Fix: Make the JNI interface actually work" X-Git-Tag: v2.0.2~3 X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=commitdiff_plain;h=8bc39f8703eb1189eb9d8b91345a554ccfcb2975 Revert "Fix: Make the JNI interface actually work" This reverts commit 46adf653a1d01b8e87baa30cc9b92616eee1a788. It changes the makefiles, and broke make dist. This does not belong in a stable release. Signed-off-by: Mathieu Desnoyers --- diff --git a/liblttng-ust-java/.gitignore b/liblttng-ust-java/.gitignore index 677373ea..ab97d041 100644 --- a/liblttng-ust-java/.gitignore +++ b/liblttng-ust-java/.gitignore @@ -1,2 +1,2 @@ -org_lttng_ust_LTTngUst.h -org/ +UST.class +UST.h diff --git a/liblttng-ust-java/LTTNG_UST.c b/liblttng-ust-java/LTTNG_UST.c new file mode 100644 index 00000000..af29c1e9 --- /dev/null +++ b/liblttng-ust-java/LTTNG_UST.c @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2011-2012 Mathieu Desnoyers + * + * 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. + * + * 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 + +#define TRACEPOINT_DEFINE +#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 index 00000000..7ec61103 --- /dev/null +++ b/liblttng-ust-java/LTTNG_UST.java @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2011-2012 Mathieu Desnoyers + * + * 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. + * + * 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 + */ + +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/LTTngUst.c b/liblttng-ust-java/LTTngUst.c deleted file mode 100644 index 3d23d6a1..00000000 --- a/liblttng-ust-java/LTTngUst.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2011-2012 Mathieu Desnoyers - * - * 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. - * - * 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 - -#define TRACEPOINT_DEFINE -#define TRACEPOINT_CREATE_PROBES -#include "lttng_ust_java.h" - -JNIEXPORT void JNICALL Java_org_lttng_ust_LTTngUst_tracepointString(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); - - (*env)->ReleaseStringUTFChars(env, ev_name, ev_name_cstr); - (*env)->ReleaseStringUTFChars(env, args, args_cstr); -} diff --git a/liblttng-ust-java/LTTngUst.java b/liblttng-ust-java/LTTngUst.java deleted file mode 100644 index d3f1edaf..00000000 --- a/liblttng-ust-java/LTTngUst.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2011-2012 Mathieu Desnoyers - * - * 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. - * - * 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 - */ - -package org.lttng.ust; - -class LTTngUst { - public static native void tracepointString(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 9e01e045..31915d0d 100644 --- a/liblttng-ust-java/Makefile.am +++ b/liblttng-ust-java/Makefile.am @@ -3,20 +3,19 @@ if BUILD_JNI_INTERFACE AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = liblttng-ust-java.la -liblttng_ust_java_la_SOURCES = LTTngUst.c org_lttng_ust_LTTngUst.h lttng_ust_java.h -dist_noinst_DATA = LTTngUst.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: LTTngUst.class org_lttng_ust_LTTngUst.h +all: LTTNG_UST.class LTTNG_UST.h clean-local: - rm org_lttng_ust_LTTngUst.h - rm -rf org/ + rm -rf LTTNG_UST.h LTTNG_UST.class -LTTngUst.class: LTTngUst.java - javac -d "$(builddir)" "$(srcdir)/LTTngUst.java" +LTTNG_UST.class: LTTNG_UST.java + javac -d "$(builddir)" "$(srcdir)/LTTNG_UST.java" -org_lttng_ust_LTTngUst.h: LTTngUst.class - javah org.lttng.ust.LTTngUst +LTTNG_UST.h: LTTNG_UST.class + javah -classpath ./ -jni LTTNG_UST endif