Changeset 21651 in vbox for trunk/src/VBox/GuestHost/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

File:

• trunk/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp (modified) (31 diffs)

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

@@ -403 +403 @@
                 char *pszName = XGetAtomName(XtDisplay(pCtx->widget),
                                                    pTargets[i]);
-                Log2(("%s: found target %s\n", __PRETTY_FUNCTION__, pszName));
+                LogRel2(("%s: found target %s\n", __PRETTY_FUNCTION__, pszName));
                 XFree(pszName);
             }
@@ -425 +425 @@
     bool changed = false;
 
-    Log3 (("%s: called\n", __PRETTY_FUNCTION__));
+    LogRel3 (("%s: called\n", __PRETTY_FUNCTION__));
     if (pCtx->fOwnsClipboard)
         /* VBox raced us and we lost.  So we don't want to report anything. */
@@ -502 +502 @@
 {
     CLIPBACKEND *pCtx = (CLIPBACKEND *)pUserData;
-    Log3 (("%s: called\n", __PRETTY_FUNCTION__));
+    LogRel3 (("%s: called\n", __PRETTY_FUNCTION__));
     /* Get the current clipboard contents if we don't own it ourselves */
     if (!pCtx->fOwnsClipboard)
     {
-        Log3 (("%s: requesting the targets that the X11 clipboard offers\n",
+        LogRel3 (("%s: requesting the targets that the X11 clipboard offers\n",
                __PRETTY_FUNCTION__));
         XtGetSelectionValue(pCtx->widget,
@@ -695 +695 @@
 {
     int rc = VINF_SUCCESS;
-    LogFlowFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     /*
      * Immediately return if we are not connected to the X server.
@@ -757 +757 @@
         LogRelFunc(("rc=%Rrc\n", rc));
     clipUninit(pCtx);
-    LogFlowFunc(("returning %Rrc.\n", rc));
+    LogRelFlowFunc(("returning %Rrc.\n", rc));
     return rc;
 }
@@ -782 +782 @@
                                          * sizeof(Atom));
     unsigned cTargets = 0;
-    LogFlowFunc (("called\n"));
+    LogRelFlowFunc (("called\n"));
     CLIPX11FORMAT format = NIL_CLIPX11FORMAT;
     do
@@ -812 +812 @@
 {
     int rc = VINF_SUCCESS;
-    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 (u32Format == VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
@@ -831 +831 @@
         rc = ClipRequestDataForX11(pCtx->pFrontend, u32Format,
                                           ppv, pcb);
-    LogFlowFunc(("returning %Rrc\n", rc));
+    LogRelFlowFunc(("returning %Rrc\n", rc));
     if (RT_SUCCESS(rc))
-        LogFlowFunc(("*ppv=%.*ls, *pcb=%u\n", *pcb, *ppv, *pcb));
+        LogRelFlowFunc(("*ppv=%.*ls, *pcb=%u\n", *pcb, *ppv, *pcb));
     return rc;
 }
@@ -876 +876 @@
     int rc = VINF_SUCCESS;
 
-    LogFlowFunc (("pwszSrc=%.*ls, cbSrc=%u\n", cbSrc, pwszSrc, cbSrc));
+    LogRelFlowFunc (("pwszSrc=%.*ls, cbSrc=%u\n", cbSrc, pwszSrc, cbSrc));
     /* How long will the converted text be? */
     AssertPtr(pwszSrc);
@@ -897 +897 @@
     if (pcbActual)
         *pcbActual = cbDest + 1;
-    LogFlowFunc(("returning %Rrc\n", rc));
+    LogRelFlowFunc(("returning %Rrc\n", rc));
     if (RT_SUCCESS(rc))
-        LogFlowFunc (("converted string is %.*s. Returning.\n", cbDest,
+        LogRelFlowFunc (("converted string is %.*s. Returning.\n", cbDest,
                       pszBuf));
     return rc;
@@ -984 +984 @@
     int rc = VINF_SUCCESS, xrc = 0;
 
-    LogFlowFunc(("pwszSrc=%.*ls, cbSrc=%u\n", cbSrc / 2, pwszSrc, cbSrc));
+    LogRelFlowFunc(("pwszSrc=%.*ls, cbSrc=%u\n", cbSrc / 2, pwszSrc, cbSrc));
     AssertPtrReturn(pDisplay, false);
     AssertPtrReturn(pwszSrc, false);
@@ -1015 +1015 @@
     *pcLenReturn = property.nitems + 1;
     *piFormatReturn = property.format;
-    LogFlowFunc(("returning %Rrc\n", rc));
+    LogRelFlowFunc(("returning %Rrc\n", rc));
     if (RT_SUCCESS(rc))
-        LogFlowFunc (("converted string is %s\n", property.value));
+        LogRelFlowFunc (("converted string is %s\n", property.value));
     return rc;
 }
@@ -1083 +1083 @@
     int rc = VINF_SUCCESS;
 
-    LogFlowFunc(("\n"));
+    LogRelFlowFunc(("\n"));
     if (   !pCtx->fOwnsClipboard   /* Drop requests we receive too late. */
         || !clipIsSupportedSelectionType(pCtx->widget, *atomSelection))
@@ -1093 +1093 @@
         rc = clipConvertVBoxCBForX11(pCtx, atomTarget, atomTypeReturn,
                                      pValReturn, pcLenReturn, piFormatReturn);
-    LogFlowFunc(("returning, internal status code %Rrc\n", rc));
+    LogRelFlowFunc(("returning, internal status code %Rrc\n", rc));
     return RT_SUCCESS(rc);
 }
@@ -1102 +1102 @@
 static void clipReleaseCB(CLIPBACKEND *pCtx)
 {
-    LogFlowFunc (("\n"));
+    LogRelFlowFunc (("\n"));
     /* The formats should be set to the right values as soon as we start
      * polling */
@@ -1118 +1118 @@
 {
     CLIPBACKEND *pCtx = clipLookupContext(widget);
-    LogFlowFunc (("\n"));
+    LogRelFlowFunc (("\n"));
     clipReleaseCB(pCtx);
 }
@@ -1175 +1175 @@
     uint32_t u32Formats = pFormats->formats;
     RTMemFree(pFormats);
-    LogFlowFunc (("u32Formats=%d\n", u32Formats));
+    LogRelFlowFunc (("u32Formats=%d\n", u32Formats));
     clipInvalidateVBoxCBCache(pCtx);
     clipGrabX11CB(pCtx, u32Formats);
     clipResetX11Formats(pCtx);
-    LogFlowFunc(("returning\n"));
+    LogRelFlowFunc(("returning\n"));
 }
 
@@ -1222 +1222 @@
                              PRTUTF16 *ppwszDest, uint32_t *pcbDest)
 {
-    LogFlowFunc(("pwcSrc=%p, cwcSrc=%u, ppwszDest=%p\n", pwcSrc, cwcSrc,
+    LogRelFlowFunc(("pwcSrc=%p, cwcSrc=%u, ppwszDest=%p\n", pwcSrc, cwcSrc,
                  ppwszDest));
     AssertPtrReturn(pwcSrc, VERR_INVALID_POINTER);
@@ -1242 +1242 @@
     if (RT_SUCCESS(rc))
     {
-        LogFlowFunc (("converted string is %.*ls\n", cwcDest, pwszDest));
+        LogRelFlowFunc (("converted string is %.*ls\n", cwcDest, pwszDest));
         *ppwszDest = pwszDest;
         if (pcbDest)
@@ -1249 +1249 @@
     else
         RTMemFree(pwszDest);
-    LogFlowFunc(("returning %Rrc\n", rc));
+    LogRelFlowFunc(("returning %Rrc\n", rc));
     if (pcbDest)
-        LogFlowFunc(("*pcbDest=%u\n", *pcbDest));
+        LogRelFlowFunc(("*pcbDest=%u\n", *pcbDest));
     return rc;
 }
@@ -1269 +1269 @@
                             PRTUTF16 *ppwszDest, uint32_t *pcbDest)
 {
-    LogFlowFunc(("pcSrc=%p, cbSrc=%u, ppwszDest=%p\n", pcSrc, cbSrc,
+    LogRelFlowFunc(("pcSrc=%p, cbSrc=%u, ppwszDest=%p\n", pcSrc, cbSrc,
                  ppwszDest));
     AssertPtrReturn(pcSrc, VERR_INVALID_POINTER);
@@ -1282 +1282 @@
         rc = clipUtf16ToWinTxt(pwcTmp, cwcTmp, ppwszDest, pcbDest);
     RTUtf16Free(pwcTmp);
-    LogFlowFunc(("Returning %Rrc\n", rc));
+    LogRelFlowFunc(("Returning %Rrc\n", rc));
     if (pcbDest)
-        LogFlowFunc(("*pcbDest=%u\n", *pcbDest));
+        LogRelFlowFunc(("*pcbDest=%u\n", *pcbDest));
     return rc;
 }
@@ -1305 +1305 @@
                              uint32_t *pcbDest)
 {
-    LogFlowFunc(("widget=%p, pcSrc=%p, cbSrc=%u, ppwszDest=%p\n", widget,
+    LogRelFlowFunc(("widget=%p, pcSrc=%p, cbSrc=%u, ppwszDest=%p\n", widget,
                  pcSrc, cbSrc, ppwszDest));
     AssertReturn(widget, VERR_INVALID_PARAMETER);
@@ -1353 +1353 @@
         XFreeStringList(ppcTmp);
     RTStrFree(pszTmp);
-    LogFlowFunc(("Returning %Rrc\n", rc));
+    LogRelFlowFunc(("Returning %Rrc\n", rc));
     if (pcbDest)
-        LogFlowFunc(("*pcbDest=%u\n", *pcbDest));
+        LogRelFlowFunc(("*pcbDest=%u\n", *pcbDest));
     return rc;
 }
@@ -1373 +1373 @@
                               PRTUTF16 *ppwszDest, uint32_t *pcbDest)
 {
-    LogFlowFunc (("pcSrc=%.*s, cbSrc=%u, ppwszDest=%p\n", cbSrc,
+    LogRelFlowFunc (("pcSrc=%.*s, cbSrc=%u, ppwszDest=%p\n", cbSrc,
                   (char *) pcSrc, cbSrc, ppwszDest));
     AssertPtrReturn(pcSrc, VERR_INVALID_POINTER);
@@ -1408 +1408 @@
             }
         pwszDest[cwcDest - 1] = '\0';  /* Make sure we are zero-terminated. */
-        LogFlowFunc (("converted text is %.*ls\n", cwcDest, pwszDest));
+        LogRelFlowFunc (("converted text is %.*ls\n", cwcDest, pwszDest));
     }
     if (RT_SUCCESS(rc))
@@ -1414 +1414 @@
     else
         RTMemFree(pwszDest);
-    LogFlowFunc(("Returning %Rrc\n", rc));
+    LogRelFlowFunc(("Returning %Rrc\n", rc));
     if (pcbDest)
-        LogFlowFunc(("*pcbDest=%u\n", *pcbDest));
+        LogRelFlowFunc(("*pcbDest=%u\n", *pcbDest));
     return rc;
 }
@@ -1448 +1448 @@
 {
     CLIPREADX11CBREQ *pReq = (CLIPREADX11CBREQ *) pClientData;
-    LogFlowFunc(("pReq->mFormat=%02X, pReq->mTextFormat=%u, pReq->mCtx=%p\n",
+    LogRelFlowFunc(("pReq->mFormat=%02X, pReq->mTextFormat=%u, pReq->mCtx=%p\n",
                  pReq->mFormat, pReq->mTextFormat, pReq->mCtx));
     AssertPtr(pReq->mCtx);
@@ -1504 +1504 @@
     // else
     //     clipReportEmptyX11CB(pCtx);
-    LogFlowFunc(("rc=%Rrc\n", rc));
+    LogRelFlowFunc(("rc=%Rrc\n", rc));
 }
 
@@ -1514 +1514 @@
     CLIPREADX11CBREQ *pReq = (CLIPREADX11CBREQ *)pUserData;
     CLIPBACKEND *pCtx = pReq->mCtx;
-    LogFlowFunc (("pReq->mFormat = %02X\n", pReq->mFormat));
+    LogRelFlowFunc (("pReq->mFormat = %02X\n", pReq->mFormat));
 
     int rc = VINF_SUCCESS;
@@ -1552 +1552 @@
         RTMemFree(pReq);
     }
-    LogFlowFunc(("status %Rrc\n", rc));
+    LogRelFlowFunc(("status %Rrc\n", rc));
 }