Changeset 105408 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 18, 2024 6:19:16 PM (10 months ago)

Author:

vboxsync

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

164062

Message:

GA/Windows: Cleanup logging in Guest Capabilities state tracker. bugref:10714

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxCaps.cpp (modified) (13 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxCaps.cpp

@@ -43 +43 @@
 } VBOXCAPS_ENTRY_ACSTATE;
 
-
 struct VBOXCAPS_ENTRY;
 struct VBOXCAPS;
@@ -67 +66 @@
 static VBOXCAPS gVBoxCaps;
 
-
-/* we need to perform Acquire/Release using the file handled we use for rewuesting events from VBoxGuest
- * otherwise Acquisition mechanism will treat us as different client and will not propagate necessary requests
- * */
+static const char* vboxCapsFuncState2Str(VBOXCAPS_ENTRY_FUNCSTATE state)
+{
+    switch (state)
+    {
+        case VBOXCAPS_ENTRY_FUNCSTATE_UNSUPPORTED: return "unsupported";
+        case VBOXCAPS_ENTRY_FUNCSTATE_SUPPORTED:   return "supported";
+        case VBOXCAPS_ENTRY_FUNCSTATE_STARTED:     return "started";
+        default:
+            return "unknown";
+    }
+}
+
+static const char* vboxCapsAcquireState2Str(VBOXCAPS_ENTRY_ACSTATE state)
+{
+    switch (state)
+    {
+        case VBOXCAPS_ENTRY_ACSTATE_RELEASED:  return "released";
+        case VBOXCAPS_ENTRY_ACSTATE_ACQUIRING: return "acquiring";
+        case VBOXCAPS_ENTRY_ACSTATE_ACQUIRED:  return "acquired";
+        default:
+            return "unknown";
+    }
+}
+
+static const char* vboxCapsIdx2Str(uint32_t iCap)
+{
+    switch (iCap)
+    {
+        case VBOXCAPS_ENTRY_IDX_SEAMLESS: return "SEAMLESS";
+        case VBOXCAPS_ENTRY_IDX_GRAPHICS: return "GRAPHICS";
+        default:
+            return "unknown";
+    }
+}
+
 int VBoxAcquireGuestCaps(uint32_t fOr, uint32_t fNot, bool fCfg)
 {
-    Log(("VBoxAcquireGuestCaps or(0x%x), not(0x%x), cfx(%d)\n", fOr, fNot, fCfg));
+    LogFunc(("or(0x%x), not(0x%x), cfx(%d)\n", fOr, fNot, fCfg));
     int rc = VbglR3AcquireGuestCaps(fOr, fNot, fCfg);
     if (RT_FAILURE(rc))
@@ -85 +115 @@
     if (fEnabled)
     {
-        Log(("vboxCapsOnEnableSeamless: ENABLED\n"));
+        LogFunc(("ENABLED\n"));
         Assert(pCap->enmAcState == VBOXCAPS_ENTRY_ACSTATE_ACQUIRED);
         Assert(pCap->enmFuncState == VBOXCAPS_ENTRY_FUNCSTATE_STARTED);
@@ -92 +122 @@
     else
     {
-        Log(("vboxCapsOnEnableSeamless: DISABLED\n"));
+        LogFunc(("DISABLED\n"));
         Assert(pCap->enmAcState != VBOXCAPS_ENTRY_ACSTATE_ACQUIRED || pCap->enmFuncState != VBOXCAPS_ENTRY_FUNCSTATE_STARTED);
         VBoxSeamlessDisable();
@@ -102 +132 @@
     VBOXCAPS *pConsole = &gVBoxCaps;
 
-    Log(("vboxCapsEntryAcStateSet: new state enmAcState(%d); pCap: fCap(%d), iCap(%d), enmFuncState(%d), enmAcState(%d)\n",
-            enmAcState, pCap->fCap, pCap->iCap, pCap->enmFuncState, pCap->enmAcState));
+    LogFunc(("new enmAcState(%d); pCap: fCap(%d), iCap(%d), enmFuncState(%d), enmAcState(%d)\n",
+        enmAcState, pCap->fCap, pCap->iCap, pCap->enmFuncState, pCap->enmAcState));
 
     if (pCap->enmAcState == enmAcState)
@@ -124 +154 @@
             pCap->pfnOnEnable(pConsole, pCap, FALSE);
     }
+
+    LogFunc(("%s %s -> %s\n", vboxCapsIdx2Str(pCap->iCap),
+        vboxCapsAcquireState2Str(enmOldAcState), vboxCapsAcquireState2Str(enmAcState)));
 }
 
@@ -130 +163 @@
     VBOXCAPS *pConsole = &gVBoxCaps;
 
-    Log(("vboxCapsEntryFuncStateSet: new state enmAcState(%d); pCap: fCap(%d), iCap(%d), enmFuncState(%d), enmAcState(%d)\n",
-            enmFuncState, pCap->fCap, pCap->iCap, pCap->enmFuncState, pCap->enmAcState));
+    LogFunc(("new enmFuncState(%d); fCap(%d), iCap(%d), enmFuncState(%d), enmAcState(%d)\n",
+        enmFuncState, pCap->fCap, pCap->iCap, pCap->enmFuncState, pCap->enmAcState));
 
     if (pCap->enmFuncState == enmFuncState)
@@ -154 +187 @@
             pCap->pfnOnEnable(pConsole, pCap, FALSE);
     }
+
+    LogFunc((" %s %s -> %s\n", vboxCapsIdx2Str(pCap->iCap),
+        vboxCapsFuncState2Str(enmOldFuncState), vboxCapsFuncState2Str(enmFuncState)));
 }
 
@@ -182 +218 @@
     if (!RT_SUCCESS(rc))
     {
-        LogFlowFunc(("vboxCapsEntryReleaseAll VBoxAcquireGuestCaps failed rc %d\n", rc));
+        LogFlowFunc(("failed rc %d\n", rc));
         return rc;
     }
@@ -188 +224 @@
     if (pConsole->idTimer)
     {
-        Log(("killing console timer\n"));
+        LogFunc(("killing console timer\n"));
         KillTimer(g_hwndToolWindow, pConsole->idTimer);
         pConsole->idTimer = 0;
@@ -285 +321 @@
     Assert(VBoxConsoleIsAllowed());
     VBOXCAPS_ENTRY *pCap = &pConsole->aCaps[iCap];
-    Log(("VBoxCapsEntryAcquire %d\n", iCap));
+    LogFunc(("%d\n", iCap));
     if (pCap->enmAcState != VBOXCAPS_ENTRY_ACSTATE_RELEASED)
     {
@@ -302 +338 @@
     if (rc != VERR_RESOURCE_BUSY)
     {
-        LogFlowFunc(("vboxCapsEntryReleaseAll VBoxAcquireGuestCaps failed rc %d\n", rc));
+        LogFlowFunc(("VBoxAcquireGuestCaps failed rc %d\n", rc));
         return rc;
     }
@@ -327 +363 @@
 {
     VBOXCAPS *pConsole = &gVBoxCaps;
-    Log(("VBoxCapsAcquireAllSupported\n"));
+    LogFlowFuncEnter();
     for (int i = 0; i < RT_ELEMENTS(pConsole->aCaps); ++i)
     {
         if (pConsole->aCaps[i].enmFuncState >= VBOXCAPS_ENTRY_FUNCSTATE_SUPPORTED)
         {
-            Log(("VBoxCapsAcquireAllSupported acquiring cap %d, state %d\n", i, pConsole->aCaps[i].enmFuncState));
+            LogFunc(("acquiring cap %d, state %d\n", i, pConsole->aCaps[i].enmFuncState));
             VBoxCapsEntryAcquire(i);
         }
         else
         {
-            LogFlowFunc(("VBoxCapsAcquireAllSupported: WARN: cap %d not supported, state %d\n", i, pConsole->aCaps[i].enmFuncState));
+            LogFlowFunc(("WARN: cap %d not supported, state %d\n", i, pConsole->aCaps[i].enmFuncState));
         }
     }