Changeset 29212 in vbox for trunk/src

Timestamp:

May 7, 2010 1:31:09 PM (15 years ago)

Author:

vboxsync

Message:

java bridge: better proxy lifetime, callbacks work, but JVM crash later

Location:

trunk/src/libs/xpcom18a4/java

Files:

• src/nsJavaXPCOMBindingUtils.cpp (modified) (1 diff)
• src/nsJavaXPCOMGlue.cpp (modified) (4 diffs)
• src/org/virtualbox/VirtualBoxManager.java (modified) (1 diff)
• tests/TestVBox.java (modified) (2 diffs)

trunk/src/libs/xpcom18a4/java/src/nsJavaXPCOMBindingUtils.cpp

@@ -926 +926 @@
 GetJNIEnv()
 {
-  JNIEnv* env;
+  JNIEnv* env = nsnull;
   jint rc = gCachedJVM->GetEnv((void**) &env, JNI_VERSION_1_2);
+#ifdef VBOX
+  if (env == nsnull)
+  {
+      rc = gCachedJVM->AttachCurrentThreadAsDaemon((void**)&env, nsnull);
+      printf("attaching\n");
+  }
+#endif
   NS_ASSERTION(rc == JNI_OK && env != nsnull,
                "Current thread not attached to given JVM instance");

trunk/src/libs/xpcom18a4/java/src/nsJavaXPCOMGlue.cpp

@@ -128 +128 @@
     nsIXPTCProxy*              mOuter;
   public:
-    NS_DECL_ISUPPORTS
+    NS_DECL_ISUPPORTS_INHERITED
 
     nsXPTCJStub(REFNSIID aIID, nsIXPTCProxy* aOuter, nsIInterfaceInfo* ii)
@@ -141 +141 @@
     {
         //if (mOuter)
-        //    mOuter->Release();
+        //  mOuter->Release();
     }
 
@@ -158 +158 @@
 };
 
-NS_IMPL_ADDREF(nsXPTCJStub)
-NS_IMPL_RELEASE(nsXPTCJStub)
+NS_IMETHODIMP_(nsrefcnt)
+nsXPTCJStub::AddRef()
+{
+    return mOuter->AddRef();
+}
+
+NS_IMETHODIMP_(nsrefcnt)
+nsXPTCJStub::Release()
+{
+    return mOuter->Release();
+}
 
 NS_IMETHODIMP nsXPTCJStub::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 {
+    nsIID* mIID;
+    mII->GetInterfaceIID(&mIID);
+
+    if (mIID->Equals(aIID)) {
+        NS_ADDREF_THIS();
+        *aInstancePtr = static_cast<nsISupports*>(this);
+        return NS_OK;
+    }
+
     return mOuter->QueryInterface(aIID, aInstancePtr);
 }
@@ -197 +215 @@
     if (!newbase)
         return NS_ERROR_OUT_OF_MEMORY;
-
     *aResult = newbase;
 #endif

trunk/src/libs/xpcom18a4/java/src/org/virtualbox/VirtualBoxManager.java

@@ -111 +111 @@
         progressBar(p, timeout);
         session.close();
-
         return true;
     }

trunk/src/libs/xpcom18a4/java/tests/TestVBox.java

@@ -68 +68 @@
             }
 
-            VBoxCallbacks vboxCallbacks = new VBoxCallbacks();
-            vbox.registerCallback(mgr.makeVirtualBoxCallback(vboxCallbacks));
+            boolean withCallbacks = false;
+            VBoxCallbacks vboxCallbacks = null;
+
+            if (withCallbacks)
+            {
+                vboxCallbacks = new VBoxCallbacks();
+                vbox.registerCallback(mgr.makeVirtualBoxCallback(vboxCallbacks));
+            }
 
             /* do something silly, start the first VM in the list */
             String m = machs[0].getName();
             System.out.println("\nAttempting to start VM '" + m + "'");
-            if (mgr.startVm(m, 7000))
+            if (false || mgr.startVm(m, 7000))
             {
-                if (false)
+                if (!withCallbacks)
                 {
                     System.out.println("started, presss any key...");
@@ -92 +98 @@
             }
 
-            vbox.unregisterCallback(vboxCallbacks);
+            if (withCallbacks)
+                vbox.unregisterCallback(vboxCallbacks);
         }
         catch (Throwable e)