Changeset 69734 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 18, 2017 2:06:23 AM (7 years ago)

Author:

vboxsync

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

119130

Message:

Main: SDS plan B proof of concept.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• idl/midl.xsl (modified) (1 diff)
• include/VirtualBoxSDSImpl.h (modified) (1 diff)
• src-server/win/svcmain.cpp (modified) (17 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -24380 +24380 @@
   -->
   <interface
-    name="IVBoxSVC" extends="$unknown"
-    uuid="8876e618-8936-4b2c-3015-aaebe6d479b9"
-    wsmap="suppress"
-    reservedMethods="2" reservedAttributes="4"
+    name="IVBoxSVC" extends="IUnknown"
+    uuid="902659ea-d14e-4444-4bc1-40b0d01ae9b3"
+    wsmap="suppress" internal="yes"  notdual="yes"
+    reservedMethods="0" reservedAttributes="0"
     >
       <desc>

trunk/src/VBox/Main/idl/midl.xsl

@@ -219 +219 @@
     uuid(<xsl:value-of select="@uuid"/>),
     object,
+<xsl:if test="@notdual != 'yes'">
     dual,
+</xsl:if>
     oleautomation
 <xsl:if test="$g_fGenProxy = 'yes'">

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

@@ -139 +139 @@
     static VirtualBoxCache m_cache;
     friend VirtualBoxToken;
+
+#ifdef VBOX_WITH_SDS_PLAN_B
+    // quick and dirty for checking the concept.
+    IVBoxSVC *m_pVBoxSVC;
+    uint32_t  m_pidVBoxSVC;
+#endif
 };
 

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
  * SVCMAIN - COM out-of-proc server main entry
  */
@@ -17 +16 @@
  */
 
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
+#define RTMEM_WRAP_SOME_NEW_AND_DELETE_TO_EF // DONT COMMIT
+#define RTMEM_WRAP_TO_EF_APIS
+#include <iprt/mem.h>
 #include <iprt/win/windows.h>
 #include <stdio.h>
@@ -27 +33 @@
 
 #include "VirtualBoxImpl.h"
-#ifdef VBOX_WITH_SDS_PLAN_B
-# include "VBoxSVCWrap.h"
-#endif
+//#ifdef VBOX_WITH_SDS_PLAN_B
+//# include "VBoxSVCWrap.h"
+//#endif
 #include "Logging.h"
 
@@ -44 +50 @@
 #include <iprt/asm.h>
 
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
+#define MAIN_WND_CLASS L"VirtualBox Interface"
+
+
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
 class CExeModule : public ATL::CComModule
 {
@@ -54 +70 @@
     bool HasActiveConnection();
     bool bActivity;
+    static bool isIdleLockCount(LONG cLocks);
 };
+
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
+BEGIN_OBJECT_MAP(ObjectMap)
+    OBJECT_ENTRY(CLSID_VirtualBox, VirtualBox)
+END_OBJECT_MAP()
+
+CExeModule *g_pModule     = NULL;
+HWND        g_hMainWindow = NULL;
+HINSTANCE   g_hInstance   = NULL;
+#ifdef VBOX_WITH_SDS_PLAN_B
+/** This is set if we're connected to SDS and should discount a server lock
+ * that it is holding when deciding whether we're idle or not. */
+bool        g_fRegisteredWithVBoxSDS = false;
+#endif
 
 /* Normal timeout usually used in Shutdown Monitor */
@@ -60 +94 @@
 volatile uint32_t dwTimeOut = dwNormalTimeout; /* time for EXE to be idle before shutting down. Can be decreased at system shutdown phase. */
 
+
+
 /* Passed to CreateThread to monitor the shutdown event */
 static DWORD WINAPI MonitorProc(void* pv)
@@ -70 +106 @@
 LONG CExeModule::Unlock()
 {
-    LONG l = ATL::CComModule::Unlock();
-    if (l == 0)
+    LONG cLocks = ATL::CComModule::Unlock();
+    if (isIdleLockCount(cLocks))
     {
         bActivity = true;
         SetEvent(hEventShutdown); /* tell monitor that we transitioned to zero */
     }
-    return l;
+    return cLocks;
 }
 
 bool CExeModule::HasActiveConnection()
 {
-    return bActivity || GetLockCount() > 0;
+    return bActivity || !isIdleLockCount(GetLockCount());
+}
+
+/**
+ * Checks if @a cLocks signifies an IDLE server lock load.
+ *
+ * This takes VBoxSDS into account (i.e. ignores it).
+ */
+/*static*/ bool CExeModule::isIdleLockCount(LONG cLocks)
+{
+#ifdef VBOX_WITH_SDS_PLAN_B
+    if (g_fRegisteredWithVBoxSDS)
+        return cLocks <= 1;
+#endif
+    return cLocks <= 0;
 }
 
@@ -90 +140 @@
     {
         WaitForSingleObject(hEventShutdown, INFINITE);
-        DWORD dwWait=0;
+        DWORD dwWait;
         do
         {
@@ -160 +210 @@
     IUnknown              *m_pObj;
     /** Pointer to the IVBoxSVC implementation that VBoxSDS works with. */
-    ComObjPtr<VBoxSVC>     m_ptrVBoxSVC;
+    VBoxSVC               *m_pVBoxSVC;
     /** The VBoxSDS interface. */
     ComPtr<IVirtualBoxSDS> m_ptrVirtualBoxSDS;
 
 public:
-    VirtualBoxClassFactory() : m_iState(0), m_hrcCreate(S_OK), m_pObj(NULL) { }
+    VirtualBoxClassFactory() : m_iState(0), m_hrcCreate(S_OK), m_pObj(NULL), m_pVBoxSVC(NULL)
+    { }
+
     virtual ~VirtualBoxClassFactory()
     {
@@ -173 +225 @@
             m_pObj = NULL;
         }
+
         /** @todo Need to check if this is okay wrt COM termination. */
         i_deregisterWithSds();
@@ -181 +234 @@
 
     /** Worker for VBoxSVC::getVirtualBox. */
-    HRESULT i_getVirtualBox(ComPtr<IUnknown> &aResult);
+    HRESULT i_getVirtualBox(IUnknown **ppResult);
 
 private:
     HRESULT VirtualBoxClassFactory::i_registerWithSds(IUnknown **ppOtherVirtualBox);
     void    VirtualBoxClassFactory::i_deregisterWithSds(void);
+
+    friend VBoxSVC;
 };
 
@@ -193 +248 @@
  * VirtualBox object when the next VBoxSVC for this user registers itself.
  */
-class ATL_NO_VTABLE VBoxSVC : public VBoxSVCWrap
-{
-public:
-    DECLARE_EMPTY_CTOR_DTOR(VBoxSVC)
-
-    HRESULT FinalConstruct()
-    {
-        return BaseFinalConstruct();
-    }
-
-    void FinalRelease()
-    {
-        uninit();
-        BaseFinalRelease();
-    }
-
-    // public initializer/uninitializer for internal purposes only
-    HRESULT init(VirtualBoxClassFactory *pFactory)
-    {
-        AutoInitSpan autoInitSpan(this);
-        AssertReturn(autoInitSpan.isOk(), E_FAIL);
-
-        m_pFactory = pFactory;
-
-        autoInitSpan.setSucceeded();
-        return S_OK;
-    }
-
-    void uninit()
-    {
-        AutoUninitSpan autoUninitSpan(this);
-        if (!autoUninitSpan.uninitDone())
-            m_pFactory = NULL;
-    }
-
+class VBoxSVC : public IVBoxSVC
+{
 private:
-    // Wrapped IVBoxSVC method.
-    HRESULT getVirtualBox(ComPtr<IUnknown> &aResult)
-    {
-        if (m_pFactory)
-            return m_pFactory->i_getVirtualBox(aResult);
-        return E_FAIL;
-    }
+    /** Number of references. */
+    uint32_t volatile m_cRefs;
 
 public:
     /** Pointer to the factory. */
     VirtualBoxClassFactory *m_pFactory;
+
+public:
+    VBoxSVC(VirtualBoxClassFactory *pFactory)
+        : m_cRefs(1), m_pFactory(pFactory)
+    { }
+    virtual ~VBoxSVC()
+    {
+        if (m_pFactory)
+        {
+            if (m_pFactory->m_pVBoxSVC)
+                m_pFactory->m_pVBoxSVC = NULL;
+            m_pFactory = NULL;
+        }
+    }
+    RTMEMEF_NEW_AND_DELETE_OPERATORS();
+
+    // IUnknown
+    STDMETHOD(QueryInterface)(REFIID riid, void **ppvObject)
+    {
+        if (riid == __uuidof(IUnknown))
+            *ppvObject = (void *)(IUnknown *)this;
+        else if (riid == __uuidof(IVBoxSVC))
+            *ppvObject = (void *)(IVBoxSVC *)this;
+        else
+        {
+            return E_NOINTERFACE;
+        }
+        AddRef();
+        return S_OK;
+
+    }
+
+    STDMETHOD_(ULONG,AddRef)(void)
+    {
+        uint32_t cRefs = ASMAtomicIncU32(&m_cRefs);
+        return cRefs;
+    }
+
+    STDMETHOD_(ULONG,Release)(void)
+    {
+        uint32_t cRefs = ASMAtomicDecU32(&m_cRefs);
+        if (cRefs == 0)
+            delete this;
+        return cRefs;
+    }
+
+    // IVBoxSVC
+    STDMETHOD(GetVirtualBox)(IUnknown **ppResult)
+    {
+        if (m_pFactory)
+            return m_pFactory->i_getVirtualBox(ppResult);
+        return E_FAIL;
+    }
 };
-
-DEFINE_EMPTY_CTOR_DTOR(VBoxSVC);
 
 
@@ -250 +318 @@
      * Connect to VBoxSDS.
      */
-    ComPtr<IVirtualBoxSDS> m_ptrVirtualBoxSDS;
     HRESULT hrc = CoCreateInstance(CLSID_VirtualBoxSDS, NULL, CLSCTX_LOCAL_SERVER, IID_IVirtualBoxSDS,
                                    (void **)m_ptrVirtualBoxSDS.asOutParam());
@@ -258 +325 @@
          * Create VBoxSVC object and hand that to VBoxSDS.
          */
-        hrc = m_ptrVBoxSVC.createObject();
+        m_pVBoxSVC = new VBoxSVC(this);
+        hrc = m_ptrVirtualBoxSDS->RegisterVBoxSVC(m_pVBoxSVC, GetCurrentProcessId(), ppOtherVirtualBox);
         if (SUCCEEDED(hrc))
         {
-            hrc = m_ptrVBoxSVC->init(this);
-            if (SUCCEEDED(hrc))
-            {
-                hrc = m_ptrVirtualBoxSDS->RegisterVBoxSVC(m_ptrVBoxSVC, GetCurrentProcessId(), ppOtherVirtualBox);
-                if (SUCCEEDED(hrc))
-                {
-                    return hrc;
-                }
-            }
-        }
+            g_fRegisteredWithVBoxSDS = true;
+            return hrc;
+        }
+        m_pVBoxSVC->Release();
     }
     m_ptrVirtualBoxSDS.setNull();
-    m_ptrVBoxSVC.setNull();
+    m_pVBoxSVC = NULL;
     *ppOtherVirtualBox = NULL;
     return hrc;
@@ -282 +344 @@
 {
     Log(("VirtualBoxClassFactory::i_deregisterWithSds\n"));
-}
-
-
-HRESULT VirtualBoxClassFactory::i_getVirtualBox(ComPtr<IUnknown> &aResult)
+
+    if (m_ptrVirtualBoxSDS.isNotNull())
+    {
+        if (m_pVBoxSVC)
+        {
+            HRESULT hrc = m_ptrVirtualBoxSDS->DeregisterVBoxSVC(m_pVBoxSVC, GetCurrentProcessId());
+            NOREF(hrc);
+        }
+        m_ptrVirtualBoxSDS.setNull();
+        g_fRegisteredWithVBoxSDS = false;
+    }
+    if (m_pVBoxSVC)
+    {
+        m_pVBoxSVC->m_pFactory = NULL;
+        m_pVBoxSVC->Release();
+        m_pVBoxSVC = NULL;
+    }
+}
+
+
+HRESULT VirtualBoxClassFactory::i_getVirtualBox(IUnknown **ppResult)
 {
     IUnknown *pObj = m_pObj;
@@ -292 +371 @@
         /** @todo Do we need to do something regarding server locking?  Hopefully COM
          *        deals with that........... */
-        aResult = pObj;
+        pObj->AddRef();
+        *ppResult = pObj;
         Log(("VirtualBoxClassFactory::GetVirtualBox: S_OK - %p\n", pObj));
         return S_OK;
     }
-    aResult.setNull();
+    *ppResult = NULL;
     Log(("VirtualBoxClassFactory::GetVirtualBox: E_FAIL\n"));
     return E_FAIL;
@@ -400 +480 @@
 
 
-BEGIN_OBJECT_MAP(ObjectMap)
-    OBJECT_ENTRY(CLSID_VirtualBox, VirtualBox)
-END_OBJECT_MAP()
-
-CExeModule* g_pModule = NULL;
-HWND g_hMainWindow = NULL;
-HINSTANCE g_hInstance = NULL;
-#define MAIN_WND_CLASS L"VirtualBox Interface"
-
-
 /*
 * Wrapper for Win API function ShutdownBlockReasonCreate