X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libjava%2Fprims.cc;h=90f8dc5ca23cb388f21ee17dc4d3c449310d1b99;hb=7b00f2e904c989fd61d8c4e0c40a0c2c89bc5876;hp=a066866c534beb9ac37db6bcdb5f173e3b2ce7ab;hpb=2114cdb6787393a55e2ec0b9951b90bba0752117;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libjava/prims.cc b/libjava/prims.cc index a066866c534..90f8dc5ca23 100644 --- a/libjava/prims.cc +++ b/libjava/prims.cc @@ -1,6 +1,6 @@ // prims.cc - Code for core of runtime environment. -/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation This file is part of libgcj. @@ -32,6 +32,11 @@ details. */ #include #endif +#ifdef INTERPRETER +#include +#include "jvmti-int.h" +#endif + #ifndef DISABLE_GETENV_PROPERTIES #include #include @@ -56,7 +61,6 @@ details. */ #include #include #include -#include #include #include #include @@ -65,6 +69,12 @@ details. */ #include #include #include + +#ifdef INTERPRETER +#include +#include +#endif // INTERPRETER + #include #ifdef USE_LTDL @@ -84,7 +94,7 @@ static java::lang::OutOfMemoryError *no_memory; // Number of bytes in largest array object we create. This could be // increased to the largest size_t value, so long as the appropriate // functions are changed to take a size_t argument instead of jint. -#define MAX_OBJECT_SIZE ((1<<31) - 1) +#define MAX_OBJECT_SIZE (((size_t)1<<31) - 1) // Properties set at compile time. const char **_Jv_Compiler_Properties = NULL; @@ -99,6 +109,23 @@ property_pair *_Jv_Environment_Properties; const char **_Jv_argv; int _Jv_argc; +// Debugging options +static bool remoteDebug = false; +#ifdef INTERPRETER +static char defaultJdwpOptions[] = ""; +static char *jdwpOptions = defaultJdwpOptions; + +// Typedefs for JVMTI agent functions. +typedef jint jvmti_agent_onload_func (JavaVM *vm, char *options, + void *reserved); +typedef jint jvmti_agent_onunload_func (JavaVM *vm); + +// JVMTI agent function pointers. +static jvmti_agent_onload_func *jvmti_agentonload = NULL; +static jvmti_agent_onunload_func *jvmti_agentonunload = NULL; +static char *jvmti_agent_opts; +#endif // INTERPRETER + // Argument support. int _Jv_GetNbArgs (void) @@ -433,7 +460,7 @@ _Jv_makeUtf8Const (jstring string) -#ifdef DEBUG +#ifdef __GCJ_DEBUG void _Jv_Abort (const char *function, const char *file, int line, const char *message) @@ -442,13 +469,14 @@ void _Jv_Abort (const char *, const char *, int, const char *message) #endif { -#ifdef DEBUG +#ifdef __GCJ_DEBUG fprintf (stderr, "libgcj failure: %s\n in function %s, file %s, line %d\n", message, function, file, line); #else fprintf (stderr, "libgcj failure: %s\n", message); #endif + fflush (stderr); abort (); } @@ -1115,6 +1143,18 @@ namespace gcj // Thread stack size specified by the -Xss runtime argument. size_t stack_size = 0; + + // Start time of the VM + jlong startTime = 0; + + // Arguments passed to the VM + JArray* vmArgs; + + // Currently loaded classes + jint loadedClasses = 0; + + // Unloaded classes + jlong unloadedClasses = 0; } // We accept all non-standard options accepted by Sun's java command, @@ -1139,8 +1179,21 @@ parse_x_arg (char* option_string) } else if (! strcmp (option_string, "debug")) { - // FIXME: add JDWP/JVMDI support + remoteDebug = true; } +#ifdef INTERPRETER + else if (! strncmp (option_string, "runjdwp:", 8)) + { + if (strlen (option_string) > 8) + jdwpOptions = &option_string[8]; + else + { + fprintf (stderr, + "libgcj: argument required for JDWP options"); + return -1; + } + } +#endif // INTERPRETER else if (! strncmp (option_string, "bootclasspath:", 14)) { // FIXME: add a parse_bootclasspath_arg function @@ -1219,7 +1272,11 @@ parse_x_arg (char* option_string) { // FIXME: fail if impossible to share class data } - + else + { + // Unrecognized. + return -1; + } return 0; } @@ -1325,6 +1382,64 @@ parse_verbose_args (char* option_string, return 0; } +#ifdef INTERPRETER +// This function loads the agent functions for JVMTI from the library indicated +// by name. It returns a negative value on failure, the value of which +// indicates where ltdl failed, it also prints an error message. +static jint +load_jvmti_agent (const char *name) +{ +#ifdef USE_LTDL + if (lt_dlinit ()) + { + fprintf (stderr, + "libgcj: Error in ltdl init while loading agent library.\n"); + return -1; + } + + lt_dlhandle lib = lt_dlopenext (name); + if (!lib) + { + fprintf (stderr, + "libgcj: Error opening agent library.\n"); + return -2; + } + + if (lib) + { + jvmti_agentonload + = (jvmti_agent_onload_func *) lt_dlsym (lib, "Agent_OnLoad"); + + if (!jvmti_agentonload) + { + fprintf (stderr, + "libgcj: Error finding agent function in library %s.\n", + name); + lt_dlclose (lib); + lib = NULL; + return -4; + } + else + { + jvmti_agentonunload + = (jvmti_agent_onunload_func *) lt_dlsym (lib, "Agent_OnUnload"); + + return 0; + } + } + else + { + fprintf (stderr, "libgcj: Library %s not found in library path.\n", name); + return -3; + } + +#endif /* USE_LTDL */ + + // If LTDL cannot be used, return an error code indicating this. + return -99; +} +#endif // INTERPRETER + static jint parse_init_args (JvVMInitArgs* vm_args) { @@ -1350,6 +1465,7 @@ parse_init_args (JvVMInitArgs* vm_args) for (int i = 0; i < vm_args->nOptions; ++i) { char* option_string = vm_args->options[i].optionString; + if (! strcmp (option_string, "vfprintf") || ! strcmp (option_string, "exit") || ! strcmp (option_string, "abort")) @@ -1377,21 +1493,116 @@ parse_init_args (JvVMInitArgs* vm_args) continue; } - else if (vm_args->ignoreUnrecognized) +#ifdef INTERPRETER + else if (! strncmp (option_string, "-agentlib", sizeof ("-agentlib") - 1)) + { + char *strPtr; + + if (strlen(option_string) > (sizeof ("-agentlib:") - 1)) + strPtr = &option_string[sizeof ("-agentlib:") - 1]; + else + { + fprintf (stderr, + "libgcj: Malformed agentlib argument %s: expected lib name\n", + option_string); + return -1; + } + + // These are optional arguments to pass to the agent library. + jvmti_agent_opts = strchr (strPtr, '='); + + if (! strncmp (strPtr, "jdwp", 4)) + { + // We want to run JDWP here so set the correct variables. + remoteDebug = true; + jdwpOptions = ++jvmti_agent_opts; + } + else + { + jint nameLength; + + if (jvmti_agent_opts == NULL) + nameLength = strlen (strPtr); + else + { + nameLength = jvmti_agent_opts - strPtr; + jvmti_agent_opts++; + } + + char lib_name[nameLength + 3 + 1]; + strcpy (lib_name, "lib"); + strncat (lib_name, strPtr, nameLength); + + jint result = load_jvmti_agent (lib_name); + + if (result < 0) + { + return -1; + } + + // Mark JVMTI active + JVMTI::enabled = true; + } + + continue; + } + else if (! strncmp (option_string, "-agentpath:", + sizeof ("-agentpath:") - 1)) + { + char *strPtr; + + if (strlen(option_string) > 10) + strPtr = &option_string[10]; + else + { + fprintf (stderr, + "libgcj: Malformed agentlib argument %s: expected lib path\n", + option_string); + return -1; + } + + // These are optional arguments to pass to the agent library. + jvmti_agent_opts = strchr (strPtr, '='); + + jint nameLength; + + if (jvmti_agent_opts == NULL) + nameLength = strlen (strPtr); + else + { + nameLength = jvmti_agent_opts - strPtr; + jvmti_agent_opts++; + } + + char lib_name[nameLength + 3 + 1]; + strcpy (lib_name, "lib"); + strncat (lib_name, strPtr, nameLength); + jint result = load_jvmti_agent (strPtr); + + if (result < 0) + { + return -1; + } + + // Mark JVMTI active + JVMTI::enabled = true; + continue; + } +#endif // INTERPRETER + else { + int r = -1; if (option_string[0] == '_') - parse_x_arg (option_string + 1); - else if (! strncmp (option_string, "-X", 2)) - parse_x_arg (option_string + 2); - else + r = parse_x_arg (option_string + 1); + else if (! strncmp (option_string, "-X", 2)) + r = parse_x_arg (option_string + 2); + + if (r == -1 && ! vm_args->ignoreUnrecognized) { - unknown_option: fprintf (stderr, "libgcj: unknown option: %s\n", option_string); return -1; } } - else - goto unknown_option; } return 0; } @@ -1405,6 +1616,7 @@ _Jv_CreateJavaVM (JvVMInitArgs* vm_args) return -1; runtimeInitialized = true; + startTime = _Jv_platform_gettimeofday(); jint result = parse_init_args (vm_args); if (result < 0) @@ -1447,10 +1659,6 @@ _Jv_CreateJavaVM (JvVMInitArgs* vm_args) _Jv_InitPrimClass (&_Jv_doubleClass, "double", 'D', 8); _Jv_InitPrimClass (&_Jv_voidClass, "void", 'V', 0); - // Turn stack trace generation off while creating exception objects. - _Jv_InitClass (&java::lang::VMThrowable::class$); - java::lang::VMThrowable::trace_enabled = 0; - // We have to initialize this fairly early, to avoid circular class // initialization. In particular we want to start the // initialization of ClassLoader before we start the initialization @@ -1465,8 +1673,6 @@ _Jv_CreateJavaVM (JvVMInitArgs* vm_args) no_memory = new java::lang::OutOfMemoryError; - java::lang::VMThrowable::trace_enabled = 1; - #ifdef USE_LTDL LTDL_SET_PRELOADED_SYMBOLS (); #endif @@ -1475,6 +1681,10 @@ _Jv_CreateJavaVM (JvVMInitArgs* vm_args) _Jv_JNI_Init (); +#ifdef INTERPRETER + _Jv_JVMTI_Init (); +#endif + _Jv_GCInitializeFinalizers (&::gnu::gcj::runtime::FinalizerThread::finalizerReady); // Start the GC finalizer thread. A VirtualMachineError can be @@ -1489,6 +1699,8 @@ _Jv_CreateJavaVM (JvVMInitArgs* vm_args) { } + runtimeInitialized = true; + return 0; } @@ -1509,6 +1721,18 @@ _Jv_RunMain (JvVMInitArgs *vm_args, jclass klass, const char *name, int argc, fprintf (stderr, "libgcj: couldn't create virtual machine\n"); exit (1); } + + if (vm_args == NULL) + gcj::vmArgs = JvConvertArgv(0, NULL); + else + { + const char* vmArgs[vm_args->nOptions]; + const char** vmPtr = vmArgs; + struct _Jv_VMOption* optionPtr = vm_args->options; + for (int i = 0; i < vm_args->nOptions; ++i) + *vmPtr++ = (*optionPtr++).optionString; + gcj::vmArgs = JvConvertArgv(vm_args->nOptions, vmArgs); + } // Get the Runtime here. We want to initialize it before searching // for `main'; that way it will be set up if `main' is a JNI method. @@ -1526,6 +1750,30 @@ _Jv_RunMain (JvVMInitArgs *vm_args, jclass klass, const char *name, int argc, else main_thread = new MainThread (JvNewStringUTF (name), arg_vec, is_jar); + _Jv_AttachCurrentThread (main_thread); + +#ifdef INTERPRETER + // Start JVMTI if an agent function has been found. + if (jvmti_agentonload) + (*jvmti_agentonload) (_Jv_GetJavaVM (), jvmti_agent_opts, NULL); + + // Start JDWP + if (remoteDebug) + { + using namespace gnu::classpath::jdwp; + VMVirtualMachine::initialize (); + Jdwp *jdwp = new Jdwp (); + jdwp->setDaemon (true); + jdwp->configure (JvNewStringLatin1 (jdwpOptions)); + jdwp->start (); + + // Wait for JDWP to initialize and start + jdwp->join (); + } + // Send VMInit + if (JVMTI_REQUESTED_EVENT (VMInit)) + _Jv_JVMTI_PostEvent (JVMTI_EVENT_VM_INIT, main_thread); +#endif // INTERPRETER } catch (java::lang::Throwable *t) { @@ -1538,9 +1786,22 @@ _Jv_RunMain (JvVMInitArgs *vm_args, jclass klass, const char *name, int argc, ::exit (1); } - _Jv_AttachCurrentThread (main_thread); _Jv_ThreadRun (main_thread); +#ifdef INTERPRETER + // Send VMDeath + if (JVMTI_REQUESTED_EVENT (VMDeath)) + { + java::lang::Thread *thread = java::lang::Thread::currentThread (); + JNIEnv *jni_env = _Jv_GetCurrentJNIEnv (); + _Jv_JVMTI_PostEvent (JVMTI_EVENT_VM_DEATH, thread, jni_env); + } + + // Run JVMTI AgentOnUnload if it exists and an agent is loaded. + if (jvmti_agentonunload) + (*jvmti_agentonunload) (_Jv_GetJavaVM ()); +#endif // INTERPRETER + // If we got here then something went wrong, as MainThread is not // supposed to terminate. ::exit (1); @@ -1559,6 +1820,12 @@ JvRunMain (jclass klass, int argc, const char **argv) _Jv_RunMain (klass, NULL, argc, argv, false); } +void +JvRunMainName (const char *name, int argc, const char **argv) +{ + _Jv_RunMain (NULL, name, argc, argv, false); +} + // Parse a string and return a heap size. @@ -1748,11 +2015,14 @@ _Jv_PrependVersionedLibdir (char* libpath) { // LD_LIBRARY_PATH is not prefixed with // GCJ_VERSIONED_LIBDIR. - jsize total = (sizeof (GCJ_VERSIONED_LIBDIR) - 1) - + (sizeof (PATH_SEPARATOR) - 1) + strlen (libpath) + 1; + char path_sep[2]; + path_sep[0] = (char) _Jv_platform_path_separator; + path_sep[1] = '\0'; + jsize total = ((sizeof (GCJ_VERSIONED_LIBDIR) - 1) + + 1 /* path separator */ + strlen (libpath) + 1); retval = (char*) _Jv_Malloc (total); strcpy (retval, GCJ_VERSIONED_LIBDIR); - strcat (retval, PATH_SEPARATOR); + strcat (retval, path_sep); strcat (retval, libpath); } }