Changeset 77703 in vbox for trunk/src/VBox

Timestamp:

Mar 14, 2019 4:47:54 PM (6 years ago)

Author:

vboxsync

Message:

BVGA,Display,FE/Qt: Don't flood the release log with screen updates message (Debian testing guest), changing the LogRel statements to LogRel2. Display will LogRel actual screen size, position, flag changes (but not VRAM address). Besides being extremely noisy it also slows down guest graphics as each release log message is flushed to the disk. PS. UI folks, we don't break log messages as this reduces the grep-ability.

Location:

trunk/src/VBox

Files:

• Devices/Graphics/DevVGA_VBVA.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (4 diffs)
• Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (2 diffs)
• Main/src-client/DisplayImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

@@ -2216 +2216 @@
     RT_COPY_VOLATILE(screen, *pScreen);
     RT_UNTRUSTED_NONVOLATILE_COPY_FENCE();
-    LogRel(("VBVA: InfoScreen: [%d] @%d,%d %dx%d, line 0x%x, BPP %d, flags 0x%x\n",
-            screen.u32ViewIndex, screen.i32OriginX, screen.i32OriginY,
-            screen.u32Width, screen.u32Height,
-            screen.u32LineSize, screen.u16BitsPerPixel, screen.u16Flags));
+    LogRel2(("VBVA: InfoScreen: [%d] @%d,%d %dx%d, line 0x%x, BPP %d, flags 0x%x\n",
+             screen.u32ViewIndex, screen.i32OriginX, screen.i32OriginY,
+             screen.u32Width, screen.u32Height,
+             screen.u32LineSize, screen.u16BitsPerPixel, screen.u16Flags));
 
     /*

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -766 +766 @@
     /* Widget resize is NOT thread-safe and *probably* never will be,
      * We have to notify machine-view with the async-signal to perform resize operation. */
-    LogRel(("GUI: UIFrameBufferPrivate::NotifyChange: Screen=%lu, Origin=%lux%lu, Size=%lux%lu, Sending to async-handler\n",
-            (unsigned long)uScreenId,
-            (unsigned long)uX, (unsigned long)uY,
-            (unsigned long)uWidth, (unsigned long)uHeight));
+    LogRel2(("GUI: UIFrameBufferPrivate::NotifyChange: Screen=%lu, Origin=%lux%lu, Size=%lux%lu, Sending to async-handler\n",
+             (unsigned long)uScreenId,
+             (unsigned long)uX, (unsigned long)uY,
+             (unsigned long)uWidth, (unsigned long)uHeight));
     emit sigNotifyChange(uWidth, uHeight);
 
@@ -1068 +1068 @@
 void UIFrameBufferPrivate::handleNotifyChange(int iWidth, int iHeight)
 {
-    LogRel(("GUI: UIFrameBufferPrivate::handleNotifyChange: Size=%dx%d\n", iWidth, iHeight));
+    LogRel2(("GUI: UIFrameBufferPrivate::handleNotifyChange: Size=%dx%d\n", iWidth, iHeight));
 
     /* Make sure machine-view is assigned: */
@@ -1180 +1180 @@
     if (m_sourceBitmap.isNull())
     {
-        LogRel(("GUI: UIFrameBufferPrivate::performResize: Size=%dx%d, "
-                "Using fallback buffer since no source bitmap is provided\n", iWidth, iHeight));
+        LogRel(("GUI: UIFrameBufferPrivate::performResize: Size=%dx%d, Using fallback buffer since no source bitmap is provided\n",
+                iWidth, iHeight));
 
         /* Remember new size came from hint: */
@@ -1194 +1194 @@
     else
     {
-        LogRel(("GUI: UIFrameBufferPrivate::performResize: Size=%dx%d, "
-                "Directly using source bitmap content\n", iWidth, iHeight));
+        LogRel2(("GUI: UIFrameBufferPrivate::performResize: Size=%dx%d, Directly using source bitmap content\n",
+                 iWidth, iHeight));
 
         /* Acquire source-bitmap attributes: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -338 +338 @@
 void UIMachineView::sltHandleNotifyChange(int iWidth, int iHeight)
 {
-    LogRel(("GUI: UIMachineView::sltHandleNotifyChange: Screen=%d, Size=%dx%d\n",
-            (unsigned long)m_uScreenId, iWidth, iHeight));
+    LogRel2(("GUI: UIMachineView::sltHandleNotifyChange: Screen=%d, Size=%dx%d\n",
+             (unsigned long)m_uScreenId, iWidth, iHeight));
 
     /* Some situations require frame-buffer resize-events to be ignored at all,
@@ -1035 +1035 @@
 {
     /* Save guest-screen size-hint: */
-    LogRel(("GUI: UIMachineView::storeGuestSizeHint: "
-            "Storing guest-screen size-hint for screen %d as %dx%d\n",
-            (int)screenId(), sizeHint.width(), sizeHint.height()));
+    LogRel2(("GUI: UIMachineView::storeGuestSizeHint: Storing guest-screen size-hint for screen %d as %dx%d\n",
+             (int)screenId(), sizeHint.width(), sizeHint.height()));
     gEDataManager->setLastGuestScreenSizeHint(m_uScreenId, sizeHint, vboxGlobal().managedVMUuid());
 }

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

@@ -919 +919 @@
                                    int32_t xOrigin, int32_t yOrigin, bool fVGAResize)
 {
-    LogRel(("Display::handleDisplayResize: uScreenId=%d pvVRAM=%p w=%d h=%d bpp=%d cbLine=0x%X flags=0x%X\n", uScreenId,
-            pvVRAM, w, h, bpp, cbLine, flags));
+    LogRel2(("Display::i_handleDisplayResize: uScreenId=%d pvVRAM=%p w=%d h=%d bpp=%d cbLine=0x%X flags=0x%X\n", uScreenId,
+             pvVRAM, w, h, bpp, cbLine, flags));
 
     /* Caller must not hold the object lock. */
@@ -957 +957 @@
 
     if (uScreenId >= mcMonitors)
+    {
+        LogRel(("Display::i_handleDisplayResize: mcMonitors=%u < uScreenId=%u (pvVRAM=%p w=%u h=%u bpp=%d cbLine=0x%X flags=0x%X)\n",
+                mcMonitors, uScreenId, pvVRAM, w, h, bpp, cbLine, flags));
         return VINF_SUCCESS;
+    }
 
     DISPLAYFBINFO *pFBInfo = &maFramebuffers[uScreenId];
@@ -993 +997 @@
         h = pFBInfo->h;
     }
+
+    /* Log changes. */
+    if (   pFBInfo->w != w
+        || pFBInfo->h != h
+        || pFBInfo->u32LineSize != cbLine
+        /*|| pFBInfo->pu8FramebufferVRAM != (uint8_t *)pvVRAM - too noisy */
+        || (   !fVGAResize
+            && (   pFBInfo->xOrigin != xOrigin
+                || pFBInfo->yOrigin != yOrigin
+                || pFBInfo->flags != flags)))
+        LogRel(("Display::i_handleDisplayResize: uScreenId=%d pvVRAM=%p w=%d h=%d bpp=%d cbLine=0x%X flags=0x%X origin=%d,%d\n",
+                uScreenId, pvVRAM, w, h, bpp, cbLine, flags, xOrigin, yOrigin));
 
     /* Update the video mode information. */