Changeset 35135 in vbox

Timestamp:

Dec 15, 2010 1:41:41 PM (14 years ago)

Author:

vboxsync

Message:

Main/VirtualBoxClient: If the API client process stays alive after the VBoxSVC unavailability was signalled, assume that the client can properly handle the corresponding available event. In this case, restart VBoxSVC and continue.

Location:

trunk/src/VBox/Main

Files:

• VirtualBoxClientImpl.cpp (modified) (6 diffs)
• include/VirtualBoxClientImpl.h (modified) (1 diff)

trunk/src/VBox/Main/VirtualBoxClientImpl.cpp

@@ -73 +73 @@
         AssertFailedReturn(E_FAIL);
 
-    rc = unconst(mData.m_pVirtualBox).createLocalObject(CLSID_VirtualBox);
+    rc = mData.m_pVirtualBox.createLocalObject(CLSID_VirtualBox);
     AssertComRCReturnRC(rc);
 
@@ -130 +130 @@
     }
 
-    unconst(mData.m_pVirtualBox).setNull();
+    mData.m_pVirtualBox.setNull();
 
     ASMAtomicDecU32(&g_cInstances);
@@ -151 +151 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    /* this is const, no need to lock */
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
     mData.m_pVirtualBox.queryInterfaceTo(aVirtualBox);
     return S_OK;
@@ -220 +220 @@
         {
             HRESULT rc = S_OK;
-            ComPtr<IVirtualBox> pV = pThis->mData.m_pVirtualBox;
+            ComPtr<IVirtualBox> pV;
+            {
+                AutoReadLock alock(pThis COMMA_LOCKVAL_SRC_POS);
+                pV = pThis->mData.m_pVirtualBox;
+            }
             if (!pV.isNull())
             {
@@ -228 +232 @@
                 {
                     LogRel(("VirtualBoxClient: detected unresponsive VBoxSVC (rc=%Rhrc)\n", rc));
+                    {
+                        AutoWriteLock alock(pThis COMMA_LOCKVAL_SRC_POS);
+                        /* Throw away the VirtualBox reference, it's no longer
+                         * usable as VBoxSVC terminated in the mean time. */
+                        pThis->mData.m_pVirtualBox.setNull();
+                    }
                     fireVBoxSVCUnavailableEvent(pThis->mData.m_pEventSource);
-
-                    /* Throw away the VirtualBox reference, it's no longer
-                     * usable as VBoxSVC terminated in the mean time. */
-                    unconst(pThis->mData.m_pVirtualBox).setNull();
                 }
             }
@@ -241 +247 @@
                  * restart attempts in some wedged config can cause high CPU
                  * and disk load. */
-                rc = unconst(pThis->mData.m_pVirtualBox).createLocalObject(CLSID_VirtualBox);
+                ComPtr<IVirtualBox> pVBox;
+                rc = pVBox.createLocalObject(CLSID_VirtualBox);
                 if (FAILED(rc))
                     cMillies = 3 * VBOXCLIENT_DEFAULT_INTERVAL;
                 else
+                {
+                    LogRel(("VirtualBoxClient: detected working VBoxSVC (rc=%Rhrc)\n", rc));
+                    {
+                        AutoWriteLock alock(pThis COMMA_LOCKVAL_SRC_POS);
+                        /* Update the VirtualBox reference, there's a working
+                         * VBoxSVC again from now on. */
+                        pThis->mData.m_pVirtualBox = pVBox;
+                    }
+                    fireVBoxSVCAvailableEvent(pThis->mData.m_pEventSource);
                     cMillies = VBOXCLIENT_DEFAULT_INTERVAL;
+                }
             }
         }

trunk/src/VBox/Main/include/VirtualBoxClientImpl.h

@@ -76 +76 @@
         {}
 
-        const ComPtr<IVirtualBox> m_pVirtualBox;
+        ComPtr<IVirtualBox> m_pVirtualBox;
         const ComObjPtr<EventSource> m_pEventSource;