Changeset 64156 in vbox for trunk/src/VBox/Additions/common/VBoxVideo

Timestamp:

Oct 5, 2016 1:43:52 PM (8 years ago)

Author:

vboxsync

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

111134

Message:

bugref:8614: Additions/common/VBoxVideo: make the code more self-contained: disable all logging statements (comment them out, do not remove them) so as not to pull in the logging sub-system. Added a note suggesting that we give callers the information they need to do any logging.

Location:

trunk/src/VBox/Additions/common/VBoxVideo

Files:

• HGSMIBase.cpp (modified) (12 diffs)
• Modesetting.cpp (modified) (7 diffs)
• VBVABase.cpp (modified) (9 diffs)

trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp

@@ -24 +24 @@
 
 #include <iprt/asm.h>
-#include <iprt/log.h>
+// #include <iprt/log.h>
 #include <iprt/string.h>
 
@@ -411 +411 @@
     *pcbHostArea = cbHostArea;
     *poffVRAMHostArea = offVRAMHostArea;
-    LogFunc(("offVRAMHostArea = 0x%08X, cbHostArea = 0x%08X\n",
-             offVRAMHostArea, cbHostArea));
+    // LogFunc(("offVRAMHostArea = 0x%08X, cbHostArea = 0x%08X\n",
+    //          offVRAMHostArea, cbHostArea));
 }
 
@@ -462 +462 @@
                                          uint32_t cbHostArea)
 {
-    Log(("VBoxVideo::vboxSetupAdapterInfo\n"));
+    // Log(("VBoxVideo::vboxSetupAdapterInfo\n"));
 
     /* setup the flags first to ensure they are initialized by the time the
@@ -480 +480 @@
         AssertRC(rc);
     }
-    Log(("VBoxVideo::vboxSetupAdapterInfo finished rc = %d\n", rc));
+    // Log(("VBoxVideo::vboxSetupAdapterInfo finished rc = %d\n", rc));
     return rc;
 }
@@ -519 +519 @@
     int rc = VINF_SUCCESS;
     VBVACONF32 *p;
-    LogFunc(("u32Index = %d\n", u32Index));
+    // LogFunc(("u32Index = %d\n", u32Index));
 
     rc = testQueryConf(pCtx);
@@ -537 +537 @@
         {
             *pulValue = p->u32Value;
-            LogFunc(("u32Value = %d\n", p->u32Value));
+            // LogFunc(("u32Value = %d\n", p->u32Value));
         }
         /* Free the IO buffer. */
@@ -544 +544 @@
     else
         rc = VERR_NO_MEMORY;
-    LogFunc(("rc = %d\n", rc));
+    // LogFunc(("rc = %d\n", rc));
     return rc;
 }
@@ -589 +589 @@
         fFlags |= VBOX_MOUSE_POINTER_VISIBLE;
     }
-    LogFlowFunc(("cbData %d, %dx%d\n", cbData, cWidth, cHeight));
+    // LogFlowFunc(("cbData %d, %dx%d\n", cbData, cWidth, cHeight));
     if (cbData > cbLength)
     {
-        LogFunc(("calculated pointer data size is too big (%d bytes, limit %d)\n",
-                 cbData, cbLength));
+        // LogFunc(("calculated pointer data size is too big (%d bytes, limit %d)\n",
+        //          cbData, cbLength));
         return VERR_INVALID_PARAMETER;
     }
@@ -624 +624 @@
     else
         rc = VERR_NO_MEMORY;
-    LogFlowFunc(("rc %d\n", rc));
+    // LogFlowFunc(("rc %d\n", rc));
     return rc;
 }
@@ -647 +647 @@
     int rc = VINF_SUCCESS;
     VBVACURSORPOSITION *p;
-    Log(("%s: x=%u, y=%u\n", __PRETTY_FUNCTION__, (unsigned)x, (unsigned)y));
+    // Log(("%s: x=%u, y=%u\n", __PRETTY_FUNCTION__, (unsigned)x, (unsigned)y));
 
     /* Allocate the IO buffer. */
@@ -664 +664 @@
             if (pyHost)
                 *pyHost = p->y;
-            Log(("%s: return: x=%u, y=%u\n", __PRETTY_FUNCTION__, (unsigned)p->x, (unsigned)p->y));
+            // Log(("%s: return: x=%u, y=%u\n", __PRETTY_FUNCTION__, (unsigned)p->x, (unsigned)p->y));
         }
         /* Free the IO buffer. */
@@ -671 +671 @@
     else
         rc = VERR_NO_MEMORY;
-    LogFunc(("rc = %d\n", rc));
+    // LogFunc(("rc = %d\n", rc));
     return rc;
 }

trunk/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp

@@ -24 +24 @@
 
 #include <iprt/asm.h>
-#include <iprt/log.h>
+// #include <iprt/log.h>
 
 #ifndef VBOX_GUESTR3XF86MOD
@@ -42 +42 @@
     uint32_t cDisplays = 0;
     VBoxQueryConfHGSMI(pCtx, VBOX_VBVA_CONF32_MONITOR_COUNT, &cDisplays);
-    LogFunc(("cDisplays = %d\n", cDisplays));
+    // LogFunc(("cDisplays = %d\n", cDisplays));
     if (cDisplays == 0 || cDisplays > VBOX_VIDEO_MAX_SCREENS)
         /* Host reported some bad value. Continue in the 1 screen mode. */
@@ -258 +258 @@
     if (!p)
     {
-        LogFunc(("HGSMIHeapAlloc failed\n"));
+        // LogFunc(("HGSMIHeapAlloc failed\n"));
     }
     else
@@ -298 +298 @@
     int rc = VINF_SUCCESS;
     VBVAREPORTINPUTMAPPING *p;
-    Log(("%s: cOriginX=%d, cOriginY=%d, cWidth=%u, cHeight=%u\n", __PRETTY_FUNCTION__, (int)cOriginX, (int)cOriginX,
-         (unsigned)cWidth, (unsigned)cHeight));
+    // Log(("%s: cOriginX=%d, cOriginY=%d, cWidth=%u, cHeight=%u\n", __PRETTY_FUNCTION__, (int)cOriginX, (int)cOriginX,
+    //      (unsigned)cWidth, (unsigned)cHeight));
 
     /* Allocate the IO buffer. */
@@ -317 +317 @@
     else
         rc = VERR_NO_MEMORY;
-    LogFunc(("rc = %d\n", rc));
+    // LogFunc(("rc = %d\n", rc));
     return rc;
 }
@@ -341 +341 @@
     if (!p)
     {
-        LogFunc(("HGSMIHeapAlloc failed\n"));
+        // LogFunc(("HGSMIHeapAlloc failed\n"));
         return VERR_NO_MEMORY;
     }
@@ -374 +374 @@
     uint32_t u32Flags = 0;
     int rc = VBoxQueryConfHGSMIDef(pCtx, VBOX_VBVA_CONF32_SCREEN_FLAGS, 0, &u32Flags);
-    LogFunc(("u32Flags = 0x%x rc %Rrc\n", u32Flags, rc));
+    // LogFunc(("u32Flags = 0x%x rc %Rrc\n", u32Flags, rc));
     if (RT_FAILURE(rc))
         u32Flags = 0;

trunk/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp

@@ -20 +20 @@
 #include <VBox/VBoxVideo.h>
 #include <VBox/err.h>
-#include <VBox/log.h>
+// #include <VBox/log.h>
 #include <iprt/assert.h>
 #include <iprt/string.h>
@@ -62 +62 @@
         if (!p)
         {
-            LogFunc(("HGSMIHeapAlloc failed\n"));
+            // LogFunc(("HGSMIHeapAlloc failed\n"));
         }
         else
@@ -104 +104 @@
     bool bRc = false;
 
-    LogFlowFunc(("pVBVA %p\n", pVBVA));
+    // LogFlowFunc(("pVBVA %p\n", pVBVA));
 
 #if 0  /* All callers check this */
@@ -110 +110 @@
 #endif
     {
-        LogFunc(("pVBVA %p vbva off 0x%x\n", pVBVA, pCtx->offVRAMBuffer));
+        // LogFunc(("pVBVA %p vbva off 0x%x\n", pVBVA, pCtx->offVRAMBuffer));
 
         pVBVA->hostFlags.u32HostEvents      = 0;
@@ -141 +141 @@
                                  int32_t cScreen)
 {
-    LogFlowFunc(("\n"));
+    // LogFlowFunc(("\n"));
 
     pCtx->fHwBufferOverflow = false;
@@ -178 +178 @@
         {
             /* Even after flush there is no place. Fail the request. */
-            LogFunc(("no space in the queue of records!!! first %d, last %d\n",
-                     pCtx->pVBVA->indexRecordFirst, pCtx->pVBVA->indexRecordFree));
+            // LogFunc(("no space in the queue of records!!! first %d, last %d\n",
+            //          pCtx->pVBVA->indexRecordFirst, pCtx->pVBVA->indexRecordFree));
         }
         else
@@ -241 +241 @@
     if (!p)
     {
-        LogFunc(("HGSMIHeapAlloc failed\n"));
+        // LogFunc(("HGSMIHeapAlloc failed\n"));
     }
     else
@@ -315 +315 @@
         if (cbChunk >= cbHwBufferAvail)
         {
-            LogFunc(("1) avail %d, chunk %d\n", cbHwBufferAvail, cbChunk));
+            // LogFunc(("1) avail %d, chunk %d\n", cbHwBufferAvail, cbChunk));
 
             vboxHwBufferFlush (pHGSMICtx);
@@ -323 +323 @@
             if (cbChunk >= cbHwBufferAvail)
             {
-                LogFunc(("no place for %d bytes. Only %d bytes available after flush. Going to partial writes.\n",
-                            cb, cbHwBufferAvail));
+                // LogFunc(("no place for %d bytes. Only %d bytes available after flush. Going to partial writes.\n",
+                //             cb, cbHwBufferAvail));
 
                 if (cbHwBufferAvail <= pVBVA->cbPartialWriteThreshold)
                 {
-                    LogFunc(("Buffer overflow!!!\n"));
+                    // LogFunc(("Buffer overflow!!!\n"));
                     pCtx->fHwBufferOverflow = true;
                     Assert(false);