Changeset 97731 in vbox for trunk/src/VBox/HostServices/DragAndDrop

Timestamp:

Dec 2, 2022 3:37:16 PM (2 years ago)

Author:

vboxsync

Message:

DnD/Host service: Added DumpQueue() for debug builds, and also make use of DnDGuestMsgToStr() + DnDHostMsgToStr().

Location:

trunk/src/VBox/HostServices/DragAndDrop

Files:

• VBoxDragAndDropSvc.cpp (modified) (22 diffs)
• dndmanager.cpp (modified) (6 diffs)
• dndmanager.h (modified) (1 diff)

trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.cpp

@@ -427 +427 @@
 {
     RT_NOREF1(pvClient);
-    LogFlowFunc(("idClient=%RU32, u32Function=%RU32, cParms=%RU32\n", idClient, u32Function, cParms));
+    LogFlowFunc(("idClient=%RU32, u32Function=%s (%#x), cParms=%RU32\n",
+                 idClient, DnDGuestMsgToStr(u32Function), u32Function, cParms));
 
     /* Check if we've the right mode set. */
@@ -439 +440 @@
             else
             {
-                LogFlowFunc(("DnD disabled, deferring request\n"));
+                LogRel(("DnD: Feature is disabled, ignoring request from guest\n"));
                 rc = VINF_HGCM_ASYNC_EXECUTE;
             }
@@ -471 +472 @@
                 rc = VINF_SUCCESS;
             else
-                LogFlowFunc(("Host -> Guest DnD mode disabled, failing request\n"));
+                LogRel(("DnD: Host -> Guest mode disabled, ignoring request from guest\n"));
             break;
         }
@@ -489 +490 @@
             else
 #endif
-                LogFlowFunc(("Guest -> Host DnD mode disabled, failing request\n"));
+                LogRel(("DnD: Guest -> Host mode disabled, ignoring request from guest\n"));
             break;
         }
@@ -565 +566 @@
             case GUEST_DND_FN_GET_NEXT_HOST_MSG:
             {
-                LogFlowFunc(("GUEST_DND_FN_GET_NEXT_HOST_MSG\n"));
                 if (cParms == 3)
                 {
@@ -612 +612 @@
             case GUEST_DND_FN_CONNECT:
             {
-                LogFlowFunc(("GUEST_DND_FN_CONNECT\n"));
-
                 ASSERT_GUEST_BREAK(cParms >= 2);
 
@@ -648 +646 @@
             case GUEST_DND_FN_REPORT_FEATURES:
             {
-                LogFlowFunc(("GUEST_DND_FN_REPORT_FEATURES\n"));
                 rc = clientReportFeatures(pClient, cParms, paParms);
                 if (RT_SUCCESS(rc))
@@ -667 +664 @@
             case GUEST_DND_FN_QUERY_FEATURES:
             {
-                LogFlowFunc(("GUEST_DND_FN_QUERY_FEATURES"));
                 rc = clientQueryFeatures(cParms, paParms);
                 break;
@@ -673 +669 @@
             case GUEST_DND_FN_HG_ACK_OP:
             {
-                LogFlowFunc(("GUEST_DND_FN_HG_ACK_OP\n"));
-
                 ASSERT_GUEST_BREAK(cParms >= 2);
 
@@ -690 +684 @@
             case GUEST_DND_FN_HG_REQ_DATA:
             {
-                LogFlowFunc(("GUEST_DND_FN_HG_REQ_DATA\n"));
-
                 VBOXDNDCBHGREQDATADATA data;
                 RT_ZERO(data);
@@ -724 +716 @@
             case GUEST_DND_FN_HG_EVT_PROGRESS:
             {
-                LogFlowFunc(("GUEST_DND_FN_HG_EVT_PROGRESS\n"));
-
                 ASSERT_GUEST_BREAK(cParms >= 3);
 
@@ -746 +736 @@
             case GUEST_DND_FN_GH_ACK_PENDING:
             {
-                LogFlowFunc(("GUEST_DND_FN_GH_ACK_PENDING\n"));
-
                 VBOXDNDCBGHACKPENDINGDATA data;
                 RT_ZERO(data);
@@ -788 +776 @@
             case GUEST_DND_FN_GH_SND_DATA_HDR:
             {
-                LogFlowFunc(("GUEST_DND_FN_GH_SND_DATA_HDR\n"));
-
                 ASSERT_GUEST_BREAK(cParms == 12);
 
@@ -824 +810 @@
             case GUEST_DND_FN_GH_SND_DATA:
             {
-                LogFlowFunc(("GUEST_DND_FN_GH_SND_DATA\n"));
-
                 switch (pClient->uProtocolVerDeprecated)
                 {
@@ -849 +833 @@
 
                     case 2:
+                        RT_FALL_THROUGH();
                     default:
                     {
@@ -870 +855 @@
             case GUEST_DND_FN_GH_SND_DIR:
             {
-                LogFlowFunc(("GUEST_DND_FN_GH_SND_DIR\n"));
-
                 ASSERT_GUEST_BREAK(cParms >= 3);
 
@@ -891 +874 @@
             case GUEST_DND_FN_GH_SND_FILE_HDR:
             {
-                LogFlowFunc(("GUEST_DND_FN_GH_SND_FILE_HDR\n"));
-
                 ASSERT_GUEST_BREAK(cParms == 6);
 
@@ -915 +896 @@
             case GUEST_DND_FN_GH_SND_FILE_DATA:
             {
-                LogFlowFunc(("GUEST_DND_FN_GH_SND_FILE_DATA\n"));
-
                 switch (pClient->uProtocolVerDeprecated)
                 {
@@ -982 +961 @@
             case GUEST_DND_FN_GH_EVT_ERROR:
             {
-                LogFlowFunc(("GUEST_DND_FN_GH_EVT_ERROR\n"));
-
                 ASSERT_GUEST_BREAK(cParms >= 1);
 
@@ -1001 +978 @@
             default:
             {
+                LogFlowFunc(("u32Function=%s (%#x), cParms=%RU32\n", DnDHostMsgToStr(u32Function), u32Function, cParms));
+
                 /* All other messages are handled by the DnD manager. */
                 rc = m_pManager->GetNextMsg(u32Function, cParms, paParms);
@@ -1082 +1061 @@
                                  uint32_t cParms, VBOXHGCMSVCPARM paParms[]) RT_NOEXCEPT
 {
-    LogFlowFunc(("u32Function=%RU32, cParms=%RU32, cClients=%zu, cQueue=%zu\n",
-                 u32Function, cParms, m_clientMap.size(), m_clientQueue.size()));
+    LogFlowFunc(("u32Function=%s (%#x), cParms=%RU32, cClients=%zu, cQueue=%zu\n",
+                 DnDHostMsgToStr(u32Function), u32Function, cParms, m_clientMap.size(), m_clientQueue.size()));
 
     int rc;
@@ -1216 +1195 @@
             int rcNext = m_pManager->GetNextMsgInfo(&uMsgNext, &cParmsNext);
 
-            LogFlowFunc(("uMsgClient=%RU32, uMsgNext=%RU32, cParmsNext=%RU32, rcNext=%Rrc\n",
-                         uMsgClient, uMsgNext, cParmsNext, rcNext));
+            LogFlowFunc(("uMsgClient=%s (%#x), uMsgNext=%s (%#x), cParmsNext=%RU32, rcNext=%Rrc\n",
+                         DnDGuestMsgToStr(uMsgClient), uMsgClient, DnDHostMsgToStr(uMsgNext), uMsgNext, cParmsNext, rcNext));
 
             if (RT_SUCCESS(rcNext))

trunk/src/VBox/HostServices/DragAndDrop/dndmanager.cpp

@@ -60 +60 @@
     AssertPtrReturn(pMsg, VERR_INVALID_POINTER);
 
-    LogFlowFunc(("uMsg=%RU32, cParms=%RU32, fAppend=%RTbool\n", pMsg->GetType(), pMsg->GetParamCount(), fAppend));
+    LogFlowFunc(("uMsg=%s (%#x), cParms=%RU32, fAppend=%RTbool\n",
+                 DnDHostMsgToStr(pMsg->GetType()), pMsg->GetType(), pMsg->GetParamCount(), fAppend));
 
     if (fAppend)
@@ -66 +67 @@
     else
         m_queueMsg.prepend(pMsg);
+
+#ifdef DEBUG
+    DumpQueue();
+#endif
 
     /** @todo Catch / handle OOM? */
@@ -99 +104 @@
 }
 
+#ifdef DEBUG
+void DnDManager::DumpQueue(void)
+{
+    LogFunc(("Current queue (%zu items, FIFO) is: %s", m_queueMsg.size(), m_queueMsg.isEmpty() ? "<Empty>" : ""));
+    for (size_t i = 0; i < m_queueMsg.size(); ++i)
+        Log(("%s ", DnDHostMsgToStr(m_queueMsg[i]->GetType())));
+    Log(("\n"));
+}
+#endif /* DEBUG */
+
 /**
  * Retrieves information about the next message in the queue.
@@ -113 +128 @@
     int rc;
 
+#ifdef DEBUG
+    DumpQueue();
+#endif
+
     if (m_queueMsg.isEmpty())
     {
@@ -128 +147 @@
     }
 
-    LogFlowFunc(("Returning puMsg=%RU32, pcParms=%RU32, rc=%Rrc\n", *puType, *pcParms, rc));
+    LogFlowFunc(("Returning uMsg=%s (%#x), cParms=%RU32, rc=%Rrc\n", DnDHostMsgToStr(*puType), *puType, *pcParms, rc));
     return rc;
 }
@@ -143 +162 @@
 int DnDManager::GetNextMsg(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
-    LogFlowFunc(("uMsg=%RU32, cParms=%RU32\n", uMsg, cParms));
+    LogFlowFunc(("uMsg=%s (%#x), cParms=%RU32\n", DnDHostMsgToStr(uMsg), uMsg, cParms));
 
     /* Check for pending messages in our queue. */

trunk/src/VBox/HostServices/DragAndDrop/dndmanager.h

@@ -106 +106 @@
     int AddMsg(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[], bool fAppend = true);
 
+#ifdef DEBUG
+    void DumpQueue();
+#endif
+
     int GetNextMsgInfo(uint32_t *puType, uint32_t *pcParms);
     int GetNextMsg(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);