Changeset 34642 in vbox for trunk/src

Timestamp:

Dec 2, 2010 6:16:04 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68444

Message:

Main/VirtualBoxClient: Don't use the singleton factory, as the destruction of the objects is done too late (process termination). Use an instance counter approach, and make sure that only the first instance is actually working.

Location:

trunk/src/VBox/Main

Files:

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

trunk/src/VBox/Main/VirtualBoxClientImpl.cpp

@@ -22 +22 @@
 #include "Logging.h"
 
+#include <iprt/asm.h>
 #include <iprt/thread.h>
 #include <iprt/critsect.h>
@@ -32 +33 @@
 
 
+/** Initialize instance counter class variable */
+uint32_t VirtualBoxClient::g_cInstances = 0;
+
+
 // constructor / destructor
 /////////////////////////////////////////////////////////////////////////////
@@ -62 +67 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
+    mData.m_ThreadWatcher = NIL_RTTHREAD;
+    mData.m_SemEvWatcher = NIL_RTSEMEVENT;
+
+    if (ASMAtomicIncU32(&g_cInstances) != 1)
+        AssertFailedReturn(E_FAIL);
+
     rc = unconst(mData.m_pVirtualBox).createLocalObject(CLSID_VirtualBox);
     AssertComRCReturnRC(rc);
@@ -73 +84 @@
      * is not considered important enough to cause any sort of visible
      * failure. The monitoring will not be done, but that's all. */
-    mData.m_ThreadWatcher = NIL_RTTHREAD;
     int vrc = RTSemEventCreate(&mData.m_SemEvWatcher);
     AssertRC(vrc);
@@ -107 +117 @@
     if (autoUninitSpan.uninitDone())
         return;
-
-    unconst(mData.m_pVirtualBox).setNull();
 
     if (mData.m_ThreadWatcher != NIL_RTTHREAD)
@@ -121 +129 @@
         mData.m_SemEvWatcher = NIL_RTSEMEVENT;
     }
+
+    unconst(mData.m_pVirtualBox).setNull();
+
+    ASMAtomicDecU32(&g_cInstances);
 }
 

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

@@ -38 +38 @@
     VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(VirtualBoxClient, IVirtualBoxClient)
 
-    DECLARE_CLASSFACTORY_SINGLETON(VirtualBoxClient)
+    DECLARE_CLASSFACTORY()
 
     DECLARE_REGISTRY_RESOURCEID(IDR_VIRTUALBOX)
@@ -64 +64 @@
 
 private:
+    /** Instance counter for simulating something similar to a singleton.
+     * Only the first instance will be a usable object, all additional
+     * instances will return a failure at creation time and will not work. */
+    static uint32_t g_cInstances;
 
     static DECLCALLBACK(int) SVCWatcherThread(RTTHREAD ThreadSelf, void *pvUser);