OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prims.cc (_Jv_RunMain): Send JVMTI event notifications for VM_INIT and VM_DEATH instead of the JDWP... 

* prims.cc (_Jv_RunMain): Send JVMTI event notifications
        for VM_INIT and VM_DEATH instead of the JDWP notifications.

From-SVN: r121143
This commit is contained in:
Keith Seitz 2007-01-24 22:44:08 +00:00 committed by Keith Seitz
parent c65110e44c
commit 078b307321
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
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

22
libjava/prims.cc
View File

@ -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