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

Timestamp:

May 3, 2021 10:45:45 AM (4 years ago)

Author:

vboxsync

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

144155

Message:

VBoxSVC: Oops, g/c debug instrumentaion accidentally committed in
previous (r144113) and trim it back to the intended swap of two lines.

File:

• trunk/src/VBox/Main/src-server/win/svcmain.cpp (modified) (24 diffs)

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

@@ -57 +57 @@
 {
 public:
-    LONG Lock();
     LONG Unlock();
     DWORD dwThreadID;
@@ -105 +104 @@
 }
 
-
-LONG CExeModule::Lock()
-{
-    LONG cLocks = ATL::CComModule::Lock();
-    LogRel(("CExeModule::Lock: cLocks = %d\n", (int)cLocks));
-    return cLocks;
-}
-
-
 LONG CExeModule::Unlock()
 {
     LONG cLocks = ATL::CComModule::Unlock();
-    LogRel(("CExeModule::Unlock: cLocks = %d\n", (int)cLocks));
     if (isIdleLockCount(cLocks))
     {
@@ -128 +117 @@
 bool CExeModule::HasActiveConnection()
 {
-    const LONG cLocks = GetLockCount();
-    LogRel(("%s: bActivity = %s;  cLocks = %d\n",
-            __FUNCTION__,
-            bActivity ? "TRUE" : "false",
-            (int)cLocks));
-    return bActivity || !isIdleLockCount(cLocks);
+    return bActivity || !isIdleLockCount(GetLockCount());
 }
 
@@ -155 +139 @@
     while (1)
     {
+        WaitForSingleObject(hEventShutdown, INFINITE);
         DWORD dwWait;
-        dwWait = WaitForSingleObject(hEventShutdown, INFINITE);
-        LogRel(("%s: dwWait INFINITE = 0x%x\n", __FUNCTION__, dwWait));        
         do
         {
             bActivity = false;
             dwWait = WaitForSingleObject(hEventShutdown, dwTimeOut);
-            LogRel(("%s: dwWait %d = 0x%x\n", __FUNCTION__, dwTimeOut, dwWait));
         } while (dwWait == WAIT_OBJECT_0);
         /* timed out */
-        // LogRel(("%s: dwWait = %x\n", __FUNCTION__, dwWait));
         if (!HasActiveConnection()) /* if no activity let's really bail */
         {
@@ -190 +171 @@
 #if _WIN32_WINNT >= 0x0400
             CoSuspendClassObjects();
-            LogRel(("%s (end of loop)\n", __FUNCTION__));
             if (!HasActiveConnection())
 #endif
@@ -344 +324 @@
             rcRpc, CallAttribs.ClientPID, CallAttribs.IsClientLocal, CallAttribs.ProtocolSequence, CallAttribs.CallStatus,
             CallAttribs.CallType, CallAttribs.OpNum, &CallAttribs.InterfaceUuid));
-# else  // XXX: uwe
-    LogRel(("VirtualBoxClassFactory::i_registerWithSds\n"));
 # endif
 
@@ -376 +354 @@
 void VirtualBoxClassFactory::i_deregisterWithSds(void)
 {
-    LogRel(("VirtualBoxClassFactory::i_deregisterWithSds\n"));
+    Log(("VirtualBoxClassFactory::i_deregisterWithSds\n"));
 
     if (m_ptrVirtualBoxSDS.isNotNull())
@@ -413 +391 @@
         pObj->AddRef();
         *ppResult = pObj;
-        LogRel(("VirtualBoxClassFactory::GetVirtualBox: S_OK - %p\n", pObj));
+        Log(("VirtualBoxClassFactory::GetVirtualBox: S_OK - %p\n", pObj));
         return S_OK;
     }
     *ppResult = NULL;
-    LogRel(("VirtualBoxClassFactory::GetVirtualBox: E_FAIL\n"));
+    Log(("VirtualBoxClassFactory::GetVirtualBox: E_FAIL\n"));
     return E_FAIL;
 }
@@ -453 +431 @@
         {
             AssertMsg(ATL::_pAtlModule, ("ATL: referring to ATL module without having one declared in this linking namespace\n"));
-            LogRel(("VirtualBoxObjectCached::AddRef: cRefs = 2, LOCKING the module\n"));
             ATL::_pAtlModule->Lock();
-        }
-        else
-        {
-            LogRel(("VirtualBoxObjectCached::AddRef: cRefs = %u\n", (unsigned)cRefs));
         }
         return cRefs;
@@ -467 +440 @@
         ULONG cRefs = InternalRelease();
         if (cRefs == 0)
-        {
-            LogRel(("VirtualBoxObjectCached::Release: cRefs = 0: deleting...\n"));
             delete this;
-        }
         else if (cRefs == 1)
         {
             AssertMsg(ATL::_pAtlModule, ("ATL: referring to ATL module without having one declared in this linking namespace\n"));
-            LogRel(("VirtualBoxObjectCached::Release: cRefs = 1: unlocking the module\n"));
             ATL::_pAtlModule->Unlock();
-        }
-        else
-        {
-            LogRel(("VirtualBoxObjectCached::Release: cRefs = %u\n", (unsigned)cRefs));
         }
         return cRefs;
@@ -515 +480 @@
                 *ppObj = p;
         }
-        LogRel(("VirtualBoxObjectCached::CreateInstance: %Rhrc\n", hrc));
         return hrc;
     }
@@ -562 +526 @@
                      * terminate the module in case when CreateInstance() fails)
                      */
-                    LogRel(("VirtualBoxClassFactory::CreateInstance: LOCKING the module\n"));
                     ATL::_pAtlModule->Lock();
                     __try
@@ -575 +538 @@
                         else if (SUCCEEDED(hrc))
                         {
-                            LogRel(("VirtualBoxClassFactory::CreateInstance: LOCKING the module\n"));
                             ATL::_pAtlModule->Lock();
                             VirtualBoxObjectCached *p;
@@ -596 +558 @@
                     __finally
                     {
-                        LogRel(("VirtualBoxClassFactory::CreateInstance: finally unlocking the module\n"));
                         ATL::_pAtlModule->Unlock();
                     }
@@ -669 +630 @@
         case WM_QUERYENDSESSION:
         {
-            LogRel(("WM_QUERYENDSESSION\n"));
             if (g_pModule)
             {
@@ -679 +639 @@
                     /* decrease a latency of MonitorShutdown loop */
                     ASMAtomicXchgU32(&dwTimeOut, 100);
-                    LogRel(("VBoxSVCWinMain: WM_QUERYENDSESSION: VBoxSvc has active connections. bActivity = %d. Loc count = %d\n",
+                    Log(("VBoxSVCWinMain: WM_QUERYENDSESSION: VBoxSvc has active connections. bActivity = %d. Loc count = %d\n",
                          g_pModule->bActivity, g_pModule->GetLockCount()));
                 }
@@ -690 +650 @@
         case WM_ENDSESSION:
         {
-            LogRel(("WM_ENDSESSION(%s)\n", wParam == FALSE ? "false" : "true"));
             /* Restore timeout of Monitor Shutdown if user canceled system shutdown */
             if (wParam == FALSE)
             {
                 ASMAtomicXchgU32(&dwTimeOut, dwNormalTimeout);
-                LogRel(("VBoxSVCWinMain: user canceled system shutdown.\n"));
+                Log(("VBoxSVCWinMain: user canceled system shutdown.\n"));
             }
             break;
@@ -735 +694 @@
     if (atomWindowClass == 0)
     {
-        LogRel(("Failed to register main window class\n"));
+        Log(("Failed to register main window class\n"));
         rc = VERR_NOT_SUPPORTED;
     }
@@ -747 +706 @@
         if (g_hMainWindow == NULL)
         {
-            LogRel(("Failed to create main window\n"));
+            Log(("Failed to create main window\n"));
             rc = VERR_NOT_SUPPORTED;
         }
@@ -764 +723 @@
 {
     Assert(g_hMainWindow != NULL);
-    LogRel(("SVCMain: DestroyMainWindow \n"));
+    Log(("SVCMain: DestroyMainWindow \n"));
     if (g_hMainWindow != NULL)
     {
@@ -1014 +973 @@
         if (pszPipeName)
         {
-            LogRel(("SVCMAIN: Processing Helper request (cmdline=\"%s\")...\n", pszPipeName));
+            Log(("SVCMAIN: Processing Helper request (cmdline=\"%s\")...\n", pszPipeName));
 
             if (!*pszPipeName)
@@ -1029 +988 @@
             if (RT_FAILURE(vrc))
             {
-                LogRel(("SVCMAIN: Failed to process Helper request (%Rrc).\n", vrc));
+                Log(("SVCMAIN: Failed to process Helper request (%Rrc).\n", vrc));
                 nRet = 1;
             }
@@ -1047 +1006 @@
 
         if (RT_SUCCESS(CreateMainWindow()))
-            LogRel(("SVCMain: Main window succesfully created\n"));
+            Log(("SVCMain: Main window succesfully created\n"));
         else
-            LogRel(("SVCMain: Failed to create main window\n"));
+            Log(("SVCMain: Failed to create main window\n"));
 
         MSG msg;
@@ -1074 +1033 @@
     g_pModule = NULL;
 
-    LogRel(("SVCMAIN: Returning, COM server process ends.\n"));
+    Log(("SVCMAIN: Returning, COM server process ends.\n"));
     return nRet;
 }