Changeset 98053 in vbox for trunk/src/VBox/Main/src-global

Timestamp:

Jan 11, 2023 11:15:13 AM (2 years ago)

Author:

vboxsync

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

155164

Message:

VBoxSDS: Reduced unnecessary logging.

Location:

trunk/src/VBox/Main/src-global/win

Files:

• VBoxSDS.cpp (modified) (2 diffs)
• VirtualBoxSDSImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-global/win/VBoxSDS.cpp

@@ -352 +352 @@
         uint32_t const uPrevState = ASMAtomicXchgU32((uint32_t volatile *)&m_Status.dwCurrentState, dwState);
         if (!::SetServiceStatus(m_hServiceStatus, &m_Status))
-            LogRel(("Error: SetServiceStatus(%p, %u) failed: %u (uPrevState=%u)\n",
-                    m_hServiceStatus, dwState, GetLastError(), uPrevState));
+            LogRel(("Error: SetServiceStatus(%u) failed: %u (uPrevState=%u)\n",
+                    dwState, GetLastError(), uPrevState));
     }
 
@@ -1031 +1031 @@
                 LogRelFunc(("VBoxSDS: new CComServiceModule::Init failed: %Rhrc\n", hrcExit));
 
-            LogRelFunc(("VBoxSDS: deleting pServiceModule (%p)\n", pServiceModule));
             delete pServiceModule;
             pServiceModule = NULL;

trunk/src/VBox/Main/src-global/win/VirtualBoxSDSImpl.cpp

@@ -266 +266 @@
 STDMETHODIMP VirtualBoxSDS::RegisterVBoxSVC(IVBoxSVCRegistration *aVBoxSVC, LONG aPid, IUnknown **aExistingVirtualBox)
 {
-    LogRel(("registerVBoxSVC: aVBoxSVC=%p aPid=%u (%#x)\n", (IVBoxSVCRegistration *)aVBoxSVC, aPid, aPid));
+    LogRel(("registerVBoxSVC: aPid=%u (%#x)\n", aPid, aPid));
 
     /*
@@ -514 +514 @@
         hrc = E_INVALIDARG;
     }
-    LogRel2(("VirtualBoxSDS::registerVBoxSVC: returns %Rhrc aExistingVirtualBox=%p\n", hrc, (IUnknown *)aExistingVirtualBox));
+    LogRel2(("VirtualBoxSDS::registerVBoxSVC: returns %Rhrc\n", hrc));
     return hrc;
 }
@@ -521 +521 @@
 STDMETHODIMP VirtualBoxSDS::DeregisterVBoxSVC(IVBoxSVCRegistration *aVBoxSVC, LONG aPid)
 {
-    LogRel(("deregisterVBoxSVC: aVBoxSVC=%p aPid=%u (%#x)\n", (IVBoxSVCRegistration *)aVBoxSVC, aPid, aPid));
+    LogRel(("deregisterVBoxSVC: aPid=%u (%#x)\n", aPid, aPid));
     HRESULT hrc;
     if (RT_VALID_PTR(aVBoxSVC))
@@ -543 +543 @@
                 }
                 else
-                    LogRel(("deregisterVBoxSVC: not the choosen one (%p != %p)\n",
-                            (IVBoxSVCRegistration *)aVBoxSVC, (IVBoxSVCRegistration *)pUserData->m_ptrTheChosenOne));
+                    LogRel(("deregisterVBoxSVC: not the chosen one\n"));
                 pUserData->i_unlock();
                 pUserData->i_release();
@@ -957 +956 @@
                     }
                 if (cRemoved != 1)
-                    LogRel(("i_watcherThreadProc/#%u: Warning! cRemoved=%u pUserData=%p\n", pThis->iWatcher, cRemoved, pUserData));
+                    LogRel(("i_watcherThreadProc/#%u: Warning! cRemoved=%u\n", pThis->iWatcher, cRemoved));
             }
             /* Zap the entry in case we assert and leave further up. */
@@ -998 +997 @@
             DWORD dwExit = 0;
             GetExitCodeProcess(pThis->aHandles[iHandle], &dwExit);
-            LogRel(("i_watcherThreadProc/#%u: %p/%s: PID %u/%#x termination detected: %d (%#x)  [iRev=%u, cur %u]\n",
-                    pThis->iWatcher, pUserData, pUserData->m_strUsername.c_str(), pid, pid, dwExit, dwExit,
+            LogRel(("i_watcherThreadProc/#%u: %s: PID %u/%#x termination detected: %d (%#x)  [iRev=%u, cur %u]\n",
+                    pThis->iWatcher, pUserData->m_strUsername.c_str(), pid, pid, dwExit, dwExit,
                     iRevision, pUserData->m_iTheChosenOneRevision));
 
@@ -1115 +1114 @@
 
                 BOOL fRc = SetEvent(pWatcher->aHandles[0]);
-                AssertLogRelMsg(fRc, ("SetEvent(%p) failed: %u\n", pWatcher->aHandles[0], GetLastError()));
-                LogRel(("i_watchIt: Added %p/%p to watcher #%u: %RTbool\n", pUserData, hProcess, pWatcher->iWatcher, fRc));
+                AssertLogRelMsg(fRc, ("SetEvent() failed: %u\n", GetLastError()));
+                LogRel(("i_watchIt: Added process to watcher #%u: %RTbool\n", pWatcher->iWatcher, fRc));
 
                 i_incrementClientCount();
@@ -1164 +1163 @@
                 if (RT_SUCCESS(rc))
                 {
-                    LogRel(("i_watchIt: Created new watcher #%u for %p/%p\n", m_cWatchers, pUserData, hProcess));
+                    LogRel(("i_watchIt: Created new watcher #%u\n", m_cWatchers));
 
                     i_incrementClientCount();