* gnu/classpath/jdwp/VMVirtualMachine.java

        (initialize): Declare.
        * gnu/classpath/jdwp/natVMVirtualMachine.cc
        (initialize): Get and save JVMTI environment.

From-SVN: r116357

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index aa43a53e2e5777aecf9eddb6fe989a38c6cbad2d..7859422bdcd6c36f14765fc2e2e7ef961cec7067 100644 (file)
--- 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 d4985bf2f2ec80b33439fa0b48b5be4ea1c37a3d..6da1d1d631efd3f0241db2e17ccb87a71f5fa872 100644 (file)
--- 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 ef4605bedbfb088893b669bf292fb51e31659400..b475c49931d67fab23f931d106bed70d53260e20 100644 (file)
--- 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)
 {