Changeset 38966 in vbox

Timestamp:

Oct 7, 2011 9:11:35 AM (13 years ago)

Author:

vboxsync

Message:

Main/Display: made a lot of logging into conditional release logging. Perhaps we should start splitting up Main logging sometime.

File:

• trunk/src/VBox/Main/src-client/DisplayImpl.cpp (modified) (53 diffs)

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -168 +168 @@
     }
 
-    LogFlowFunc(("%dx%d -> %dx%d\n", cx, cy, cxThumbnail, cyThumbnail));
+    LogRelFlowFunc(("%dx%d -> %dx%d\n", cx, cy, cxThumbnail, cyThumbnail));
 
     cbThumbnail = cxThumbnail * 4 * cyThumbnail;
@@ -319 +319 @@
         AssertRCBreak(rc);
 
-        LogFlowFunc(("[%d] type %d, size %d bytes\n", i, typeOfBlock, cbBlock));
+        LogRelFlowFunc(("[%d] type %d, size %d bytes\n", i, typeOfBlock, cbBlock));
 
         /* Note: displaySSMSaveScreenshot writes size of a block = 8 and
@@ -414 +414 @@
 HRESULT Display::init (Console *aParent)
 {
-    LogFlowThisFunc(("aParent=%p\n", aParent));
+    LogRelFlowFunc(("this=%p: aParent=%p\n", this, aParent));
 
     ComAssertRet(aParent, E_INVALIDARG);
@@ -490 +490 @@
 void Display::uninit()
 {
-    LogFlowThisFunc(("\n"));
+    LogRelFlowFunc(("this=%p\n", this));
 
     /* Enclose the state transition Ready->InUninit->NotReady */
@@ -580 +580 @@
                    )
             {
-                LogFlowFunc(("Machine is running.\n"));
+                LogRelFlowFunc(("Machine is running.\n"));
 
                 mfMachineRunning = true;
@@ -616 +616 @@
     if (!finished)
     {
-        LogFlowFunc (("External framebuffer wants us to wait!\n"));
+        LogRelFlowFunc (("External framebuffer wants us to wait!\n"));
         return VINF_VGA_RESIZE_IN_PROGRESS;
     }
@@ -733 +733 @@
 void Display::handleResizeCompletedEMT (void)
 {
-    LogFlowFunc(("\n"));
+    LogRelFlowFunc(("\n"));
 
     unsigned uScreenId;
@@ -806 +806 @@
                 pFBInfo->pFramebuffer->NotifyUpdate(0, 0, pFBInfo->w, pFBInfo->h);
         }
-        LogFlow(("[%d]: default format %d\n", uScreenId, pFBInfo->fDefaultFormat));
+        LogRelFlow(("[%d]: default format %d\n", uScreenId, pFBInfo->fDefaultFormat));
 
 #ifdef DEBUG_sunlover
@@ -821 +821 @@
 
         /* Inform VRDP server about the change of display parameters. */
-        LogFlowFunc (("Calling VRDP\n"));
+        LogRelFlowFunc (("Calling VRDP\n"));
         mParent->consoleVRDPServer()->SendResize();
 
@@ -989 +989 @@
     AssertPtrReturnVoid(px2);
     AssertPtrReturnVoid(py2);
-    LogFlowFunc(("\n"));
+    LogRelFlowFunc(("\n"));
 
     if (!mpDrv)
@@ -1298 +1298 @@
                                      DISPLAYFBINFO *pFBInfo)
 {
-    LogFlowFunc(("HGSMI[%d]: %p\n", uScreenId, pFBInfo->pVBVAHostFlags));
+    LogRelFlowFunc(("HGSMI[%d]: %p\n", uScreenId, pFBInfo->pVBVAHostFlags));
 
     if (pFBInfo->pVBVAHostFlags)
@@ -1317 +1317 @@
         ASMAtomicWriteU32(&pFBInfo->pVBVAHostFlags->u32SupportedOrders, fu32SupportedOrders);
 
-        LogFlowFunc(("    fu32HostEvents = 0x%08X, fu32SupportedOrders = 0x%08X\n", fu32HostEvents, fu32SupportedOrders));
+        LogRelFlowFunc(("    fu32HostEvents = 0x%08X, fu32SupportedOrders = 0x%08X\n", fu32HostEvents, fu32SupportedOrders));
     }
 }
@@ -1376 +1376 @@
      * acceleration after a mode change.
      */
-    LogFlowFunc (("mfVideoAccelEnabled = %d, fEnable = %d, pVbvaMemory = %p\n",
+    LogRelFlowFunc (("mfVideoAccelEnabled = %d, fEnable = %d, pVbvaMemory = %p\n",
                   mfVideoAccelEnabled, fEnable, pVbvaMemory));
 
@@ -1393 +1393 @@
         Assert (!mfVideoAccelEnabled);
 
-        LogFlowFunc (("Machine is not yet running.\n"));
+        LogRelFlowFunc (("Machine is not yet running.\n"));
 
         if (fEnable)
@@ -1461 +1461 @@
     }
 
-    LogFlowFunc (("VideoAccelEnable: rc = %Rrc.\n", rc));
+    LogRelFlowFunc (("VideoAccelEnable: rc = %Rrc.\n", rc));
 
     return rc;
@@ -1470 +1470 @@
 void Display::VideoAccelVRDP (bool fEnable)
 {
-    LogFlowFunc(("fEnable = %d\n", fEnable));
+    LogRelFlowFunc(("fEnable = %d\n", fEnable));
 
     vbvaLock();
@@ -1725 +1725 @@
             if (!dst)
             {
-                LogFlowFunc (("could not allocate %d bytes from heap!!!\n", cbRecord));
+                LogRelFlowFunc (("could not allocate %d bytes from heap!!!\n", cbRecord));
                 mpVbvaMemory->off32Data = (mpVbvaMemory->off32Data + cbRecord) % VBVA_RING_BUFFER_SIZE;
                 return false;
@@ -1980 +1980 @@
     ULONG *aWidth, ULONG *aHeight, ULONG *aBitsPerPixel)
 {
-    LogFlowFunc (("aScreenId = %d\n", aScreenId));
+    LogRelFlowFunc (("aScreenId = %d\n", aScreenId));
 
     AutoCaller autoCaller(this);
@@ -2025 +2025 @@
     IFramebuffer *aFramebuffer)
 {
-    LogFlowFunc (("\n"));
+    LogRelFlowFunc (("\n"));
 
     if (aFramebuffer != NULL)
@@ -2088 +2088 @@
     IFramebuffer **aFramebuffer, LONG *aXOrigin, LONG *aYOrigin)
 {
-    LogFlowFunc (("aScreenId = %d\n", aScreenId));
+    LogRelFlowFunc (("aScreenId = %d\n", aScreenId));
 
     CheckComArgOutPointerValid(aFramebuffer);
@@ -2311 +2311 @@
         {
             /* Scale. */
-            LogFlowFunc(("SCALE: %dx%d -> %dx%d\n", cx, cy, width, height));
+            LogRelFlowFunc(("SCALE: %dx%d -> %dx%d\n", cx, cy, width, height));
 
             uint8_t *dst = address;
@@ -2350 +2350 @@
     //  within the Console lock to make it atomic).
 
-    LogFlowFuncEnter();
-    LogFlowFunc (("address=%p, width=%d, height=%d\n",
+    LogRelFlowFunc (("address=%p, width=%d, height=%d\n",
                   address, width, height));
 
@@ -2376 +2375 @@
     HRESULT rc = S_OK;
 
-    LogFlowFunc (("Sending SCREENSHOT request\n"));
+    LogRelFlowFunc (("Sending SCREENSHOT request\n"));
 
     /* Leave lock because other thread (EMT) is called and it may initiate a resize
@@ -2397 +2396 @@
                       tr("Could not take a screenshot (%Rrc)"), vrc);
 
-    LogFlowFunc (("rc=%08X\n", rc));
-    LogFlowFuncLeave();
+    LogRelFlowFunc (("rc=%08X\n", rc));
     return rc;
 }
@@ -2405 +2403 @@
                                              ComSafeArrayOut(BYTE, aScreenData))
 {
-    LogFlowFuncEnter();
-    LogFlowFunc (("width=%d, height=%d\n",
+    LogRelFlowFunc (("width=%d, height=%d\n",
                   width, height));
 
@@ -2431 +2428 @@
     HRESULT rc = S_OK;
 
-    LogFlowFunc (("Sending SCREENSHOT request\n"));
+    LogRelFlowFunc (("Sending SCREENSHOT request\n"));
 
     /* Leave lock because other thread (EMT) is called and it may initiate a resize
@@ -2476 +2473 @@
     RTMemFree(pu8Data);
 
-    LogFlowFunc (("rc=%08X\n", rc));
-    LogFlowFuncLeave();
+    LogRelFlowFunc (("rc=%08X\n", rc));
     return rc;
 }
@@ -2484 +2480 @@
                                              ComSafeArrayOut(BYTE, aScreenData))
 {
-    LogFlowFuncEnter();
-    LogFlowFunc (("width=%d, height=%d\n",
+    LogRelFlowFunc (("width=%d, height=%d\n",
                   width, height));
 
@@ -2510 +2505 @@
     HRESULT rc = S_OK;
 
-    LogFlowFunc (("Sending SCREENSHOT request\n"));
+    LogRelFlowFunc (("Sending SCREENSHOT request\n"));
 
     /* Leave lock because other thread (EMT) is called and it may initiate a resize
@@ -2551 +2546 @@
     RTMemFree(pu8Data);
 
-    LogFlowFunc (("rc=%08X\n", rc));
-    LogFlowFuncLeave();
+    LogRelFlowFunc (("rc=%08X\n", rc));
     return rc;
 }
@@ -2665 +2659 @@
     //  within the Console lock to make it atomic).
 
-    LogFlowFuncEnter();
-    LogFlowFunc (("address=%p, x=%d, y=%d, width=%d, height=%d\n",
+    LogRelFlowFunc (("address=%p, x=%d, y=%d, width=%d, height=%d\n",
                   (void *)address, x, y, width, height));
 
@@ -2713 +2706 @@
 //    }
 
-    LogFlowFunc (("rc=%08X\n", rc));
-    LogFlowFuncLeave();
+    LogRelFlowFunc (("rc=%08X\n", rc));
     return rc;
 }
@@ -2792 +2784 @@
 STDMETHODIMP Display::InvalidateAndUpdate()
 {
-    LogFlowFuncEnter();
+    LogRelFlowFunc(("\n"));
 
     AutoCaller autoCaller(this);
@@ -2806 +2798 @@
     HRESULT rc = S_OK;
 
-    LogFlowFunc (("Sending DPYUPDATE request\n"));
+    LogRelFlowFunc (("Sending DPYUPDATE request\n"));
 
     /* Have to leave the lock when calling EMT.  */
@@ -2820 +2812 @@
                       tr("Could not invalidate and update the screen (%Rrc)"), rcVBox);
 
-    LogFlowFunc (("rc=%08X\n", rc));
-    LogFlowFuncLeave();
+    LogRelFlowFunc (("rc=%08X\n", rc));
     return rc;
 }
@@ -2833 +2824 @@
 STDMETHODIMP Display::ResizeCompleted(ULONG aScreenId)
 {
-    LogFlowFunc (("\n"));
+    LogRelFlowFunc (("\n"));
 
     /// @todo (dmik) can we AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); here?
@@ -2879 +2870 @@
 void Display::updateDisplayData(void)
 {
-    LogFlowFunc (("\n"));
+    LogRelFlowFunc (("\n"));
 
     /* the driver might not have been constructed yet */
@@ -2936 +2927 @@
         mpDrv->IConnector.cy = 0;
     }
-    LogFlowFunc (("leave\n"));
+    LogRelFlowFunc (("leave\n"));
 }
 
@@ -2975 +2966 @@
                                               unsigned uScreenId)
 {
-    LogFlowFunc (("uScreenId = %d\n", uScreenId));
+    LogRelFlowFunc (("uScreenId = %d\n", uScreenId));
 
     AssertReturn(that, VERR_INVALID_PARAMETER);
@@ -3033 +3024 @@
     }
 
-    LogFlowFunc (("leave\n"));
+    LogRelFlowFunc (("leave\n"));
     return VINF_SUCCESS;
 }
@@ -3047 +3038 @@
     PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
 
-    LogFlowFunc (("bpp %d, pvVRAM %p, cbLine %d, cx %d, cy %d\n",
+    LogRelFlowFunc (("bpp %d, pvVRAM %p, cbLine %d, cx %d, cy %d\n",
                   bpp, pvVRAM, cbLine, cx, cy));
 
@@ -3109 +3100 @@
         if (u32ResizeStatus == ResizeStatus_UpdateDisplayData)
         {
-            LogFlowFunc (("ResizeStatus_UpdateDisplayData %d\n", uScreenId));
+            LogRelFlowFunc (("ResizeStatus_UpdateDisplayData %d\n", uScreenId));
             fNoUpdate = true; /* Always set it here, because pfnUpdateDisplayAll can cause a new resize. */
             /* The framebuffer was resized and display data need to be updated. */
@@ -3126 +3117 @@
         {
             /* The framebuffer is being resized. Do not call the VGA device back. Immediately return. */
-            LogFlowFunc (("ResizeStatus_InProcess\n"));
+            LogRelFlowFunc (("ResizeStatus_InProcess\n"));
             fNoUpdate = true;
             continue;
@@ -3187 +3178 @@
     PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
 
-    LogFlowFunc (("\n"));
+    LogRelFlowFunc (("\n"));
 
     /* Disable VBVA mode. */
@@ -3202 +3193 @@
     PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
 
-    LogFlowFunc (("fEnabled=%d\n", fEnabled));
+    LogRelFlowFunc (("fEnabled=%d\n", fEnabled));
 
     NOREF(fEnabled);
@@ -3276 +3267 @@
                  pFBInfo->u32InformationSize = pDisplay->u32InformationSize;
 
-                 LogFlow(("VBOX_VIDEO_INFO_TYPE_DISPLAY: %d: at 0x%08X, size 0x%08X, info 0x%08X\n", pDisplay->u32Index, pDisplay->u32Offset, pDisplay->u32FramebufferSize, pDisplay->u32InformationSize));
+                 LogRelFlow(("VBOX_VIDEO_INFO_TYPE_DISPLAY: %d: at 0x%08X, size 0x%08X, info 0x%08X\n", pDisplay->u32Index, pDisplay->u32Offset, pDisplay->u32FramebufferSize, pDisplay->u32InformationSize));
              }
              else if (pHdr->u8Type == VBOX_VIDEO_INFO_TYPE_QUERY_CONF32)
@@ -3379 +3370 @@
             pFBInfo->h = pScreen->u16Height;
 
-            LogFlow(("VBOX_VIDEO_INFO_TYPE_SCREEN: (%p) %d: at %d,%d, linesize 0x%X, size %dx%d, bpp %d, flags 0x%02X\n",
+            LogRelFlow(("VBOX_VIDEO_INFO_TYPE_SCREEN: (%p) %d: at %d,%d, linesize 0x%X, size %dx%d, bpp %d, flags 0x%02X\n",
                      pHdr, uScreenId, pScreen->xOrigin, pScreen->yOrigin, pScreen->u32LineSize, pScreen->u16Width, pScreen->u16Height, pScreen->bitsPerPixel, pScreen->u8Flags));
 
@@ -3574 +3565 @@
 DECLCALLBACK(int) Display::displayVBVAEnable(PPDMIDISPLAYCONNECTOR pInterface, unsigned uScreenId, PVBVAHOSTFLAGS pHostFlags)
 {
-    LogFlowFunc(("uScreenId %d\n", uScreenId));
+    LogRelFlowFunc(("uScreenId %d\n", uScreenId));
 
     PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
@@ -3589 +3580 @@
 DECLCALLBACK(void) Display::displayVBVADisable(PPDMIDISPLAYCONNECTOR pInterface, unsigned uScreenId)
 {
-    LogFlowFunc(("uScreenId %d\n", uScreenId));
+    LogRelFlowFunc(("uScreenId %d\n", uScreenId));
 
     PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
@@ -3780 +3771 @@
 DECLCALLBACK(int) Display::displayVBVAResize(PPDMIDISPLAYCONNECTOR pInterface, const PVBVAINFOVIEW pView, const PVBVAINFOSCREEN pScreen, void *pvVRAM)
 {
-    LogFlowFunc(("pScreen %p, pvVRAM %p\n", pScreen, pvVRAM));
+    LogRelFlowFunc(("pScreen %p, pvVRAM %p\n", pScreen, pvVRAM));
 
     PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
@@ -3888 +3879 @@
         {
             /* VRDP server still need this notification. */
-            LogFlowFunc (("Calling VRDP\n"));
+            LogRelFlowFunc (("Calling VRDP\n"));
             pThis->mParent->consoleVRDPServer()->SendResize();
         }
@@ -3951 +3942 @@
 {
     PDRVMAINDISPLAY pData = PDMINS_2_DATA(pDrvIns, PDRVMAINDISPLAY);
-    LogFlowFunc (("iInstance=%d\n", pDrvIns->iInstance));
+    LogRelFlowFunc (("iInstance=%d\n", pDrvIns->iInstance));
     PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
 
@@ -3979 +3970 @@
 {
     PDRVMAINDISPLAY pData = PDMINS_2_DATA(pDrvIns, PDRVMAINDISPLAY);
-    LogFlowFunc (("iInstance=%d\n", pDrvIns->iInstance));
+    LogRelFlowFunc (("iInstance=%d\n", pDrvIns->iInstance));
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);