Changeset 21651 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

Jul 16, 2009 1:57:25 PM (16 years ago)

Author:

vboxsync

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

50186

Message:

SharedClipboard/x11: switch logging from debug to user-enabled release logging so that users can trace clipboard issues

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• service.cpp (modified) (30 diffs)
• x11-clipboard.cpp (modified) (13 diffs)

trunk/src/VBox/HostServices/SharedClipboard/service.cpp

@@ -178 +178 @@
     if (pClient->fMsgQuit)
     {
-        LogFlow(("vboxSvcClipboardReturnMsg: Quit\n"));
+        LogRelFlow(("vboxSvcClipboardReturnMsg: Quit\n"));
         VBoxHGCMParmUInt32Set (&paParms[0], VBOX_SHARED_CLIPBOARD_HOST_MSG_QUIT);
         VBoxHGCMParmUInt32Set (&paParms[1], 0);
@@ -185 +185 @@
     else if (pClient->fMsgReadData)
     {
-        LogFlow(("vboxSvcClipboardReturnMsg: ReadData %02X\n", pClient->u32RequestedFormat));
+        LogRelFlow(("vboxSvcClipboardReturnMsg: ReadData %02X\n", pClient->u32RequestedFormat));
         VBoxHGCMParmUInt32Set (&paParms[0], VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA);
         VBoxHGCMParmUInt32Set (&paParms[1], pClient->u32RequestedFormat);
@@ -192 +192 @@
     else if (pClient->fMsgFormats)
     {
-        LogFlow(("vboxSvcClipboardReturnMsg: Formats %02X\n", pClient->u32AvailableFormats));
+        LogRelFlow(("vboxSvcClipboardReturnMsg: Formats %02X\n", pClient->u32AvailableFormats));
         VBoxHGCMParmUInt32Set (&paParms[0], VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS);
         VBoxHGCMParmUInt32Set (&paParms[1], pClient->u32AvailableFormats);
@@ -200 +200 @@
     {
         /* No pending messages. */
-        LogFlow(("vboxSvcClipboardReturnMsg: no message\n"));
+        LogRelFlow(("vboxSvcClipboardReturnMsg: no message\n"));
         return false;
     }
@@ -216 +216 @@
             case VBOX_SHARED_CLIPBOARD_HOST_MSG_QUIT:
             {
-                LogFlow(("vboxSvcClipboardReportMsg: Quit\n"));
+                LogRelFlow(("vboxSvcClipboardReportMsg: Quit\n"));
                 pClient->fMsgQuit = true;
             } break;
@@ -228 +228 @@
                 }
 
-                LogFlow(("vboxSvcClipboardReportMsg: ReadData %02X\n", u32Formats));
+                LogRelFlow(("vboxSvcClipboardReportMsg: ReadData %02X\n", u32Formats));
                 pClient->u32RequestedFormat = u32Formats;
                 pClient->fMsgReadData = true;
@@ -241 +241 @@
                 }
 
-                LogFlow(("vboxSvcClipboardReportMsg: Formats %02X\n", u32Formats));
+                LogRelFlow(("vboxSvcClipboardReportMsg: Formats %02X\n", u32Formats));
                 pClient->u32AvailableFormats = u32Formats;
                 pClient->fMsgFormats = true;
@@ -248 +248 @@
             {
                 /* Invalid message. */
-                LogFlow(("vboxSvcClipboardReportMsg: invalid message %d\n", u32Msg));
+                LogRelFlow(("vboxSvcClipboardReportMsg: invalid message %d\n", u32Msg));
             } break;
         }
@@ -270 +270 @@
             if (fMessageReturned)
             {
-                LogFlow(("vboxSvcClipboardReportMsg: CallComplete\n"));
+                LogRelFlow(("vboxSvcClipboardReportMsg: CallComplete\n"));
                 g_pHelpers->pfnCallComplete (callHandle, VINF_SUCCESS);
             }
@@ -357 +357 @@
     }
 
-    Log(("vboxClipboardConnect: rc = %Rrc\n", rc));
+    LogRel2(("vboxClipboardConnect: rc = %Rrc\n", rc));
 
     return rc;
@@ -372 +372 @@
     int rc = VINF_SUCCESS;
 
-    Log(("svcCall: u32ClientID = %d, fn = %d, cParms = %d, pparms = %d\n",
-         u32ClientID, u32Function, cParms, paParms));
+    LogRel2(("svcCall: u32ClientID = %d, fn = %d, cParms = %d, pparms = %d\n",
+             u32ClientID, u32Function, cParms, paParms));
 
     VBOXCLIPBOARDCLIENTDATA *pClient = (VBOXCLIPBOARDCLIENTDATA *)pvClient;
@@ -385 +385 @@
     {
         /** @todo parameters other than 32 bit */
-        Log(("    pparms[%d]: type %d value %d\n", i, paParms[i].type, paParms[i].u.uint32));
+        LogRel2(("    pparms[%d]: type %d value %d\n", i, paParms[i].type, paParms[i].u.uint32));
     }
 #endif
@@ -394 +394 @@
         {
             /* The quest requests a host message. */
-            Log(("svcCall: VBOX_SHARED_CLIPBOARD_FN_GET_HOST_MSG\n"));
+            LogRel2(("svcCall: VBOX_SHARED_CLIPBOARD_FN_GET_HOST_MSG\n"));
 
             if (cParms != VBOX_SHARED_CLIPBOARD_CPARMS_GET_HOST_MSG)
@@ -427 +427 @@
                         pClient->async.paParms    = paParms;
 
-                        Log(("svcCall: async.\n"));
+                        LogRel2(("svcCall: async.\n"));
                     }
 
@@ -442 +442 @@
         {
             /* The guest reports that some formats are available. */
-            Log(("svcCall: VBOX_SHARED_CLIPBOARD_FN_FORMATS\n"));
+            LogRel2(("svcCall: VBOX_SHARED_CLIPBOARD_FN_FORMATS\n"));
 
             if (cParms != VBOX_SHARED_CLIPBOARD_CPARMS_FORMATS)
@@ -487 +487 @@
         {
             /* The guest wants to read data in the given format. */
-            Log(("svcCall: VBOX_SHARED_CLIPBOARD_FN_READ_DATA\n"));
+            LogRel2(("svcCall: VBOX_SHARED_CLIPBOARD_FN_READ_DATA\n"));
 
             if (cParms != VBOX_SHARED_CLIPBOARD_CPARMS_READ_DATA)
@@ -533 +533 @@
                             g_fReadingData = true;
                             rc = g_pfnExtension (g_pvExtension, VBOX_CLIPBOARD_EXT_FN_DATA_READ, &parms, sizeof (parms));
-                            LogFlow(("DATA: g_fDelayedAnnouncement = %d, g_u32DelayedFormats = 0x%x\n", g_fDelayedAnnouncement, g_u32DelayedFormats));
+                            LogRelFlow(("DATA: g_fDelayedAnnouncement = %d, g_u32DelayedFormats = 0x%x\n", g_fDelayedAnnouncement, g_u32DelayedFormats));
                             if (g_fDelayedAnnouncement)
                             {
@@ -583 +583 @@
         {
             /* The guest writes the requested data. */
-            Log(("svcCall: VBOX_SHARED_CLIPBOARD_FN_WRITE_DATA\n"));
+            LogRel2(("svcCall: VBOX_SHARED_CLIPBOARD_FN_WRITE_DATA\n"));
 
             if (cParms != VBOX_SHARED_CLIPBOARD_CPARMS_WRITE_DATA)
@@ -641 +641 @@
     }
 
-    LogFlow(("svcCall: rc = %Rrc\n", rc));
+    LogRelFlow(("svcCall: rc = %Rrc\n", rc));
 
     if (!fAsynchronousProcessing)
@@ -682 +682 @@
     int rc = VINF_SUCCESS;
 
-    Log(("svcHostCall: fn = %d, cParms = %d, pparms = %d\n",
+    LogRel2(("svcHostCall: fn = %d, cParms = %d, pparms = %d\n",
          u32Function, cParms, paParms));
 
@@ -689 +689 @@
         case VBOX_SHARED_CLIPBOARD_HOST_FN_SET_MODE:
         {
-            Log(("svcCall: VBOX_SHARED_CLIPBOARD_HOST_FN_SET_MODE\n"));
+            LogRel2(("svcCall: VBOX_SHARED_CLIPBOARD_HOST_FN_SET_MODE\n"));
 
             if (cParms != 1)
@@ -715 +715 @@
     }
 
-    LogFlow(("svcHostCall: rc = %Rrc\n", rc));
+    LogRelFlow(("svcHostCall: rc = %Rrc\n", rc));
     return rc;
 }
@@ -770 +770 @@
      * pending request.
      */
-    Log(("svcSaveState: u32ClientID = %d\n", u32ClientID));
+    LogRel2(("svcSaveState: u32ClientID = %d\n", u32ClientID));
 
     VBOXCLIPBOARDCLIENTDATA *pClient = (VBOXCLIPBOARDCLIENTDATA *)pvClient;
@@ -800 +800 @@
 static DECLCALLBACK(int) svcLoadState(void *, uint32_t u32ClientID, void *pvClient, PSSMHANDLE pSSM)
 {
-    Log(("svcLoadState: u32ClientID = %d\n", u32ClientID));
+    LogRel2(("svcLoadState: u32ClientID = %d\n", u32ClientID));
 
     VBOXCLIPBOARDCLIENTDATA *pClient = (VBOXCLIPBOARDCLIENTDATA *)pvClient;
@@ -814 +814 @@
     if (len != sizeof(CLIPSAVEDSTATEDATA))
     {
-        Log(("Client data size mismatch: expected %d, got %d\n", sizeof (CLIPSAVEDSTATEDATA), len));
+        LogRel2(("Client data size mismatch: expected %d, got %d\n", sizeof (CLIPSAVEDSTATEDATA), len));
         return VERR_SSM_DATA_UNIT_FORMAT_CHANGED;
     }
@@ -825 +825 @@
     if (pClient->u32ClientID != savedState.u32ClientID)
     {
-        Log(("Client ID mismatch: expected %d, got %d\n", pClient->u32ClientID, savedState.u32ClientID));
+        LogRel2(("Client ID mismatch: expected %d, got %d\n", pClient->u32ClientID, savedState.u32ClientID));
         return VERR_SSM_DATA_UNIT_FORMAT_CHANGED;
     }
@@ -848 +848 @@
             case VBOX_CLIPBOARD_EXT_FN_FORMAT_ANNOUNCE:
             {
-                LogFlow(("ANNOUNCE: g_fReadingData = %d\n", g_fReadingData));
+                LogRelFlow(("ANNOUNCE: g_fReadingData = %d\n", g_fReadingData));
                 if (g_fReadingData)
                 {
@@ -875 +875 @@
 static DECLCALLBACK(int) svcRegisterExtension(void *, PFNHGCMSVCEXT pfnExtension, void *pvExtension)
 {
-    LogFlowFunc(("pfnExtension = %p\n", pfnExtension));
+    LogRelFlowFunc(("pfnExtension = %p\n", pfnExtension));
 
     VBOXCLIPBOARDEXTPARMS parms;
@@ -908 +908 @@
     int rc = VINF_SUCCESS;
 
-    LogFlowFunc(("ptable = %p\n", ptable));
+    LogRelFlowFunc(("ptable = %p\n", ptable));
 
     if (!ptable)
@@ -916 +916 @@
     else
     {
-        Log(("VBoxHGCMSvcLoad: ptable->cbSize = %d, ptable->u32Version = 0x%08X\n", ptable->cbSize, ptable->u32Version));
+        LogRel2(("VBoxHGCMSvcLoad: ptable->cbSize = %d, ptable->u32Version = 0x%08X\n", ptable->cbSize, ptable->u32Version));
 
         if (   ptable->cbSize != sizeof (VBOXHGCMSVCFNTABLE)

trunk/src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp

@@ -72 +72 @@
                                       uint32_t u32Formats)
 {
-    LogFlowFunc(("called.  pCtx=%p, u32Formats=%02X\n", pCtx, u32Formats));
+    LogRelFlowFunc(("called.  pCtx=%p, u32Formats=%02X\n", pCtx, u32Formats));
     vboxSvcClipboardReportMsg(pCtx->pClient,
                               VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS,
@@ -135 +135 @@
         LogRel(("Failed to initialise the shared clipboard\n"));
     }
-    LogFlowFunc(("returning %Rrc\n", rc));
+    LogRelFlowFunc(("returning %Rrc\n", rc));
     return rc;
 }
@@ -160 +160 @@
 void vboxClipboardDisconnect (VBOXCLIPBOARDCLIENTDATA *pClient)
 {
-    LogFlow(("vboxClipboardDisconnect\n"));
+    LogRelFlow(("vboxClipboardDisconnect\n"));
 
     LogRel(("Stopping the host clipboard service\n"));
@@ -192 +192 @@
                                   uint32_t u32Formats)
 {
-    LogFlowFunc(("called.  pClient=%p, u32Formats=%02X\n", pClient,
+    LogRelFlowFunc(("called.  pClient=%p, u32Formats=%02X\n", pClient,
                  u32Formats));
     ClipAnnounceFormatToX11 (pClient->pCtx->pBackend, u32Formats);
@@ -230 +230 @@
                            uint32_t *pcbActual)
 {
-    LogFlowFunc(("pClient=%p, u32Format=%02X, pv=%p, cb=%u, pcbActual=%p",
+    LogRelFlowFunc(("pClient=%p, u32Format=%02X, pv=%p, cb=%u, pcbActual=%p",
                  pClient, u32Format, pv, cb, pcbActual));
     
@@ -246 +246 @@
             rc = VINF_HGCM_ASYNC_EXECUTE;
     }
-    LogFlowFunc(("returning %Rrc\n", rc));
+    LogRelFlowFunc(("returning %Rrc\n", rc));
     return rc;
 }
@@ -290 +290 @@
 {
     int rc = VINF_SUCCESS;
-    LogFlowFunc(("pCtx=%p, pReq=%p, u32Format=%02X\n", pCtx, pReq, u32Format));
+    LogRelFlowFunc(("pCtx=%p, pReq=%p, u32Format=%02X\n", pCtx, pReq, u32Format));
     /* Request data from VBox */
     vboxSvcClipboardReportMsg(pCtx->pClient,
@@ -312 +312 @@
     if (RT_SUCCESS(rc) && (pReq->pv == NULL))
         rc = VERR_NO_DATA;
-    LogFlowFunc(("returning %Rrc\n", rc));
+    LogRelFlowFunc(("returning %Rrc\n", rc));
     return rc;
 }
@@ -323 +323 @@
 {
     int rc = VINF_SUCCESS;
-    LogFlowFunc(("pCtx=%p, pReq=%p, u32Format=%02X\n", pCtx, pReq,
+    LogRelFlowFunc(("pCtx=%p, pReq=%p, u32Format=%02X\n", pCtx, pReq,
                  u32Format));
     /* Start by "posting" the request for the next invocation of
@@ -340 +340 @@
     if (RT_SUCCESS(rc))
         rc = clipWaitForDataFromVBox(pCtx, pReq, u32Format);
-    LogFlowFunc(("returning %Rrc\n", rc));
+    LogRelFlowFunc(("returning %Rrc\n", rc));
     return rc;
 }
@@ -361 +361 @@
     VBOXCLIPBOARDREQFROMVBOX request = { NULL };
 
-    LogFlowFunc(("pCtx=%p, u32Format=%02X, ppv=%p, pcb=%p\n", pCtx,
+    LogRelFlowFunc(("pCtx=%p, u32Format=%02X, ppv=%p, pcb=%p\n", pCtx,
                  u32Format, ppv, pcb));
     if (pCtx->fShuttingDown)
     {
         /* The shared clipboard is disconnecting. */
-        LogFunc(("host requested guest clipboard data after guest had disconnected.\n"));
+        LogRelFunc(("host requested guest clipboard data after guest had disconnected.\n"));
         return VERR_WRONG_ORDER;
     }
@@ -380 +380 @@
         *pcb = request.cb;
     }
-    LogFlowFunc(("returning %Rrc\n", rc));
+    LogRelFlowFunc(("returning %Rrc\n", rc));
     if (RT_SUCCESS(rc))
-        LogFlowFunc(("*ppv=%.*ls, *pcb=%u\n", *pcb / 2, *ppv, *pcb));
+        LogRelFlowFunc(("*ppv=%.*ls, *pcb=%u\n", *pcb / 2, *ppv, *pcb));
     return rc;
 }
@@ -398 +398 @@
                              void *pv, uint32_t cb, uint32_t u32Format)
 {
-    LogFlowFunc (("called.  pClient=%p, pv=%p (%.*ls), cb=%u, u32Format=%02X\n",
+    LogRelFlowFunc (("called.  pClient=%p, pv=%p (%.*ls), cb=%u, u32Format=%02X\n",
                   pClient, pv, cb / 2, pv, cb, u32Format));