diff options
| author | kseitz <kseitz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-24 22:44:08 +0000 |
|---|---|---|
| committer | kseitz <kseitz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-24 22:44:08 +0000 |
| commit | 0cfb29d407bd9e8fe287e6744bce9140dd3de841 (patch) | |
| tree | 51cf1a2d6840c64f7d39cc95fc745064f8d2de99 /libjava | |
| parent | e4c487986739946747113dcd3ff4ad8fe7a3eb91 (diff) | |
| download | ppe42-gcc-0cfb29d407bd9e8fe287e6744bce9140dd3de841.tar.gz ppe42-gcc-0cfb29d407bd9e8fe287e6744bce9140dd3de841.zip | |
* prims.cc (_Jv_RunMain): Send JVMTI event notifications
for VM_INIT and VM_DEATH instead of the JDWP notifications.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121143 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/prims.cc | 22 |
2 files changed, 16 insertions, 11 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a69d1da2021..6b6749d4678 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2007-01-24 Keith Seitz <keiths@redhat.com> + * prims.cc (_Jv_RunMain): Send JVMTI event notifications + for VM_INIT and VM_DEATH instead of the JDWP notifications. + +2007-01-24 Keith Seitz <keiths@redhat.com> + * gnu/classpath/jdwp/natVMVirtualMachine.cc (getAllClassMethods): Implement. diff --git a/libjava/prims.cc b/libjava/prims.cc index 00d547017f4..e205dbbe521 100644 --- a/libjava/prims.cc +++ b/libjava/prims.cc @@ -32,6 +32,9 @@ details. */ #include <java/lang/ThreadGroup.h> #endif +#include <jvmti.h> +#include "jvmti-int.h" + #ifndef DISABLE_GETENV_PROPERTIES #include <ctype.h> #include <java-props.h> @@ -66,8 +69,6 @@ details. */ #include <execution.h> #include <gnu/classpath/jdwp/Jdwp.h> #include <gnu/classpath/jdwp/VMVirtualMachine.h> -#include <gnu/classpath/jdwp/event/VmDeathEvent.h> -#include <gnu/classpath/jdwp/event/VmInitEvent.h> #include <gnu/java/lang/MainThread.h> #ifdef USE_LTDL @@ -1583,10 +1584,9 @@ _Jv_RunMain (JvVMInitArgs *vm_args, jclass klass, const char *name, int argc, jdwp->join (); } - // Send VmInit - gnu::classpath::jdwp::event::VmInitEvent *event; - event = new gnu::classpath::jdwp::event::VmInitEvent (main_thread); - gnu::classpath::jdwp::Jdwp::notify (event); + // Send VMInit + if (JVMTI_REQUESTED_EVENT (VMInit)) + _Jv_JVMTI_PostEvent (JVMTI_EVENT_VM_INIT, main_thread); } catch (java::lang::Throwable *t) { @@ -1601,12 +1601,12 @@ _Jv_RunMain (JvVMInitArgs *vm_args, jclass klass, const char *name, int argc, _Jv_ThreadRun (main_thread); - // Notify debugger of VM's death - if (gnu::classpath::jdwp::Jdwp::isDebugging) + // Send VMDeath + if (JVMTI_REQUESTED_EVENT (VMDeath)) { - using namespace gnu::classpath::jdwp; - event::VmDeathEvent *event = new event::VmDeathEvent (); - Jdwp::notify (event); + java::lang::Thread *thread = java::lang::Thread::currentThread (); + JNIEnv *jni_env = _Jv_GetCurrentJNIEnv (); + _Jv_JVMTI_PostEvent (JVMTI_EVENT_VM_DEATH, thread, jni_env); } // If we got here then something went wrong, as MainThread is not |
