e1bea0c068
2007-05-31 Matthias Klose <doko@ubuntu.com> * javax/management/NotificationBroadcasterSupport.java (getNotificationInfo): Add cast. * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include directories. * native/jni/qt-peer/Makefile.in: Regenerate. libjava/ChangeLog: 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/natFileWin32.cc (setFilePermissions): New (stub only). _access: Handle EXEC query, stub only. 2007-06-03 Matthias Klose <doko@ubuntu.com> Merged from classpath: * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge. * java/lang/System.java(inheritedChannel): New. * java/lang/Character.java: Remove stray`;'. * java/net/MulticastSocket.java: Merged. * java/text/DateFormatSymbols.java(getInstance): New, comment updates. * java/text/Collator.java(getInstance): Merged. * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG. getDisplayName, getDisplayNames: New. * java/util/logging/Logger.java: Merged. * Regenerate .class and .h files. 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/File.java: Merge with classpath-0.95, new method setFilePermissions, new attribute EXEC. * java/io/natFilePosix.cc (setFilePermissions): New. _access: Handle EXEC query. * classpath/lib/java/io/File.class, java/io/File.h: Regenerate. 2007-06-03 Matthias Klose <doko@ubuntu.com> Imported GNU Classpath 0.95. * classpath/Makefile.in, classpath/native/jni/midi-dssi/Makefile.in, classpath/native/jni/classpath/Makefile.in, classpath/native/jni/Makefile.in, classpath/native/jni/gconf-peer/Makefile.in, classpath/native/jni/java-io/Makefile.in, classpath/native/jni/native-lib/Makefile.in, classpath/native/jni/java-util/Makefile.in, classpath/native/jni/midi-alsa/Makefile.in, classpath/native/jni/java-lang/Makefile.in, classpath/native/jni/java-nio/Makefile.in, classpath/native/jni/java-net/Makefile.in, classpath/native/jni/xmlj/Makefile.in, classpath/native/jni/qt-peer/Makefile.in, classpath/native/jni/gtk-peer/Makefile.in, classpath/native/Makefile.in, classpath/native/jawt/Makefile.in, classpath/native/fdlibm/Makefile.in, classpath/native/plugin/Makefile.in, classpath/resource/Makefile.in, classpath/scripts/Makefile.in, classpath/tools/Makefile.in, classpath/doc/Makefile.in, classpath/doc/api/Makefile.in, classpath/lib/Makefile.in, classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in, classpath/external/sax/Makefile.in, classpath/external/w3c_dom/Makefile.in, classpath/external/relaxngDatatype/Makefile.in, classpath/include/Makefile.in, classpath/examples/Makefile.in: Regenerate. * classpath/config.guess, classpath/config.sub, classpath/ltmain.sh : Update. * classpath/configure, classpath/depcomp, classpath/missing, classpath/aclocal.m4, classpath/install-sh: Regenerate. * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95. * sources.am: Regenerate. * Makefile.in: Regenerate. * Update the .class files and generated CNI header files, add new .class and generated CNI header files. * Remove generated files for removed java source files: classpath/gnu/java/net/BASE64.java, classpath/gnu/java/security/util/Base64.java, classpath/gnu/java/awt/peer/gtk/GThreadMutex.java, classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java, classpath/gnu/java/awt/font/autofit/Scaler.java, classpath/gnu/classpath/jdwp/util/Value.java, classpath/gnu/javax/net/ssl/Base64.java. * Remove empty directories. * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc. * java/lang/Class.java(setAccessible): Merge from classpath. * java/util/Locale.java: Remove. * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java, gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New. * gcj/javaprims.h: Update class declarations. * scripts/classes.pl: Update usage. * HACKING: Mention to build all peers. From-SVN: r125302
265 lines
7.1 KiB
C
265 lines
7.1 KiB
C
/* toolwrapper.c -- a native tool wrapper for VMs that support the JNI
|
|
invocation interface
|
|
Copyright (C) 2006 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath 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
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
#include <jni.h>
|
|
#include <ltdl.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include "config.h"
|
|
|
|
#ifndef JNI_VERSION_1_2
|
|
# error JNI version 1.2 or greater required
|
|
#endif
|
|
|
|
#ifndef MAINCLASS
|
|
#define MAINCLASS "Main"
|
|
#endif
|
|
|
|
union env_union
|
|
{
|
|
void *void_env;
|
|
JNIEnv *jni_env;
|
|
};
|
|
|
|
/* Typedef for JNI_CreateJavaVM dlopen call. */
|
|
typedef jint createVM (JavaVM **, void **, void *);
|
|
|
|
int
|
|
main (int argc, const char** argv)
|
|
{
|
|
union env_union tmp;
|
|
JNIEnv* env;
|
|
JavaVM* jvm;
|
|
JavaVMInitArgs vm_args;
|
|
jint result;
|
|
jclass class_id;
|
|
jmethodID method_id;
|
|
jstring str;
|
|
jclass string_class_id;
|
|
jobjectArray args_array;
|
|
char** non_vm_argv;
|
|
int non_vm_argc;
|
|
int i;
|
|
int classpath_found = 0;
|
|
/* Variables for JNI_CreateJavaVM dlopen call. */
|
|
lt_dlhandle libjvm_handle = NULL;
|
|
createVM* libjvm_create = NULL;
|
|
int libjvm_error = 0;
|
|
|
|
env = NULL;
|
|
jvm = NULL;
|
|
|
|
vm_args.nOptions = 0;
|
|
vm_args.options = NULL;
|
|
|
|
non_vm_argc = 0;
|
|
non_vm_argv = NULL;
|
|
|
|
if (argc > 1)
|
|
{
|
|
for (i = 1; i < argc; i++)
|
|
{
|
|
if (!strncmp (argv[i], "-J", 2))
|
|
{
|
|
if (!strncmp (argv[i], "-J-Djava.class.path=", 20))
|
|
classpath_found = 1;
|
|
|
|
/* A virtual machine option. */
|
|
vm_args.options = (JavaVMOption*) realloc (vm_args.options, (vm_args.nOptions + 1) * sizeof (JavaVMOption));
|
|
|
|
if (vm_args.options == NULL)
|
|
{
|
|
fprintf (stderr, TOOLNAME ": realloc failed.\n");
|
|
goto destroy;
|
|
}
|
|
|
|
if (strlen (argv[i]) == 2)
|
|
{
|
|
fprintf (stderr, TOOLNAME ": the -J option must not be followed by a space.\n");
|
|
goto destroy;
|
|
}
|
|
else
|
|
vm_args.options[vm_args.nOptions++].optionString = strdup (argv[i] + 2);
|
|
}
|
|
else
|
|
{
|
|
non_vm_argv = (char**) realloc (non_vm_argv, (non_vm_argc + 1) * sizeof (char*));
|
|
if (non_vm_argv == NULL)
|
|
{
|
|
fprintf (stderr, TOOLNAME ": realloc failed.\n");
|
|
goto destroy;
|
|
}
|
|
non_vm_argv[non_vm_argc++] = strdup (argv[i]);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!classpath_found)
|
|
{
|
|
/* Set the invocation classpath. */
|
|
vm_args.options = (JavaVMOption*) realloc (vm_args.options, (vm_args.nOptions + 1) * sizeof (JavaVMOption));
|
|
|
|
if (vm_args.options == NULL)
|
|
{
|
|
fprintf (stderr, TOOLNAME ": realloc failed.\n");
|
|
goto destroy;
|
|
}
|
|
|
|
vm_args.options[vm_args.nOptions++].optionString = "-Xbootclasspath/p:" TOOLS_ZIP;
|
|
}
|
|
|
|
/* Terminate vm_args.options with a NULL element. */
|
|
vm_args.options = (JavaVMOption*) realloc (vm_args.options, (vm_args.nOptions + 1) * sizeof (JavaVMOption));
|
|
if (vm_args.options == NULL)
|
|
{
|
|
fprintf (stderr, TOOLNAME ": realloc failed.\n");
|
|
goto destroy;
|
|
}
|
|
vm_args.options[vm_args.nOptions].optionString = NULL;
|
|
|
|
/* Terminate non_vm_argv with a NULL element. */
|
|
non_vm_argv = (char**) realloc (non_vm_argv, (non_vm_argc + 1) * sizeof (char*));
|
|
if (non_vm_argv == NULL)
|
|
{
|
|
fprintf (stderr, TOOLNAME ": realloc failed.\n");
|
|
goto destroy;
|
|
}
|
|
non_vm_argv[non_vm_argc] = NULL;
|
|
|
|
vm_args.version = JNI_VERSION_1_2;
|
|
vm_args.ignoreUnrecognized = JNI_TRUE;
|
|
|
|
/* dlopen libjvm.so */
|
|
libjvm_error = lt_dlinit ();
|
|
if (libjvm_error)
|
|
{
|
|
fprintf (stderr, TOOLNAME ": lt_dlinit failed.\n");
|
|
goto destroy;
|
|
}
|
|
|
|
libjvm_handle = lt_dlopenext (LIBJVM);
|
|
if (!libjvm_handle)
|
|
{
|
|
fprintf (stderr, TOOLNAME ": failed to open " LIBJVM "\n");
|
|
goto destroy;
|
|
}
|
|
libjvm_create = (createVM*) lt_dlsym (libjvm_handle, "JNI_CreateJavaVM");
|
|
if (!libjvm_create)
|
|
{
|
|
fprintf (stderr, TOOLNAME ": failed to load JNI_CreateJavaVM symbol from " LIBJVM "\n");
|
|
goto destroy;
|
|
}
|
|
result = (*libjvm_create) (&jvm, &tmp.void_env, &vm_args);
|
|
|
|
if (result < 0)
|
|
{
|
|
fprintf (stderr, TOOLNAME ": couldn't create virtual machine\n");
|
|
goto destroy;
|
|
}
|
|
|
|
env = tmp.jni_env;
|
|
|
|
string_class_id = (*env)->FindClass (env, "java/lang/String");
|
|
if (string_class_id == NULL)
|
|
{
|
|
fprintf (stderr, TOOLNAME ": FindClass failed.\n");
|
|
goto destroy;
|
|
}
|
|
|
|
args_array = (*env)->NewObjectArray (env, non_vm_argc, string_class_id, NULL);
|
|
if (args_array == NULL)
|
|
{
|
|
fprintf (stderr, TOOLNAME ": NewObjectArray failed.\n");
|
|
goto destroy;
|
|
}
|
|
|
|
for (i = 0; i < non_vm_argc; i++)
|
|
{
|
|
str = (*env)->NewStringUTF (env, non_vm_argv[i]);
|
|
if (str == NULL)
|
|
{
|
|
fprintf (stderr, TOOLNAME ": NewStringUTF failed.\n");
|
|
goto destroy;
|
|
}
|
|
|
|
(*env)->SetObjectArrayElement (env, args_array, i, str);
|
|
}
|
|
|
|
class_id
|
|
= (*env)->FindClass (env,
|
|
"gnu/classpath/tools/" TOOLPACKAGE "/" MAINCLASS);
|
|
if (class_id == NULL)
|
|
{
|
|
fprintf (stderr, TOOLNAME ": FindClass failed.\n");
|
|
goto destroy;
|
|
}
|
|
|
|
method_id = (*env)->GetStaticMethodID (env, class_id, "main", "([Ljava/lang/String;)V");
|
|
|
|
if (method_id == NULL)
|
|
{
|
|
fprintf (stderr, TOOLNAME ": GetStaticMethodID failed.\n");
|
|
goto destroy;
|
|
}
|
|
|
|
(*env)->CallStaticVoidMethod (env, class_id, method_id, args_array);
|
|
|
|
destroy:
|
|
|
|
if (env != NULL)
|
|
{
|
|
if ((*env)->ExceptionOccurred (env))
|
|
(*env)->ExceptionDescribe (env);
|
|
|
|
if (jvm != NULL)
|
|
(*jvm)->DestroyJavaVM (jvm);
|
|
}
|
|
|
|
/* libltdl cleanup */
|
|
if (libjvm_handle)
|
|
{
|
|
if (lt_dlclose (libjvm_handle) != 0)
|
|
fprintf (stderr, TOOLNAME ": failed to close " LIBJVM "\n");
|
|
}
|
|
|
|
if (lt_dlexit () != 0)
|
|
fprintf (stderr, TOOLNAME ": lt_dlexit failed.\n");
|
|
|
|
return 1;
|
|
}
|