From 38af37fc0b653ee1f2d01a724472ad49de77ab55 Mon Sep 17 00:00:00 2001
From: kseitz <kseitz@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 23 Aug 2006 22:18:08 +0000
Subject: [PATCH] * gnu/classpath/jdwp/VMVirtualMachine.java
(initialize): Declare. * gnu/classpath/jdwp/natVMVirtualMachine.cc
(initialize): Get and save JVMTI environment.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116357 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 7 +++++++
libjava/gnu/classpath/jdwp/VMVirtualMachine.java | 2 ++
libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc | 12 ++++++++++++
3 files changed, 21 insertions(+)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index aa43a53e2e57..7859422bdcd6 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-23 Keith Seitz <keiths@redhat.com>
+
+ * gnu/classpath/jdwp/VMVirtualMachine.java
+ (initialize): Declare.
+ * gnu/classpath/jdwp/natVMVirtualMachine.cc
+ (initialize): Get and save JVMTI environment.
+
2006-08-22 Thomas Fitzsimmons <fitzsim@redhat.com>
PR libgcj/27890
diff --git a/libjava/gnu/classpath/jdwp/VMVirtualMachine.java b/libjava/gnu/classpath/jdwp/VMVirtualMachine.java
index d4985bf2f2ec..6da1d1d631ef 100644
--- a/libjava/gnu/classpath/jdwp/VMVirtualMachine.java
+++ b/libjava/gnu/classpath/jdwp/VMVirtualMachine.java
@@ -57,6 +57,8 @@ import java.util.Iterator;
*/
public class VMVirtualMachine
{
+ public static native void initialize ();
+
/**
* Suspend a thread
*
diff --git a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
index ef4605bedbfb..b475c49931d6 100644
--- a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
+++ b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
@@ -10,6 +10,8 @@ details. */
#include <config.h>
#include <gcj/cni.h>
+#include <jvm.h>
+#include <jvmti.h>
#include <java/lang/Class.h>
#include <java/lang/ClassLoader.h>
@@ -28,6 +30,16 @@ using namespace java::lang;
using namespace gnu::classpath::jdwp::event;
using namespace gnu::classpath::jdwp::util;
+// JVMTI environment
+static jvmtiEnv *_jdwp_jvmtiEnv;
+
+void
+gnu::classpath::jdwp::VMVirtualMachine::initialize ()
+{
+ JavaVM *vm = _Jv_GetJavaVM ();
+ vm->GetEnv (reinterpret_cast<void **> (&_jdwp_jvmtiEnv), JVMTI_VERSION_1_0);
+}
+
void
gnu::classpath::jdwp::VMVirtualMachine ::suspendThread (Thread *thread)
{
--
GitLab