Changeset 56994 in vbox

Timestamp:

Jul 18, 2015 11:15:01 PM (10 years ago)

Author:

vboxsync

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

101709

Message:

Main: Log and assert formatting fixes.

Location:

trunk/src/VBox/Main

Files:

• src-all/VirtualBoxBase.cpp (modified) (1 diff)
• src-client/DrvAudioVRDE.cpp (modified) (1 diff)
• src-client/Nvram.cpp (modified) (3 diffs)
• src-client/UsbCardReader.cpp (modified) (1 diff)
• src-client/VideoRec.cpp (modified) (1 diff)
• src-helper-apps/VBoxExtPackHelperApp.cpp (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (1 diff)
• src-server/Performance.cpp (modified) (2 diffs)
• src-server/generic/NetIf-generic.cpp (modified) (1 diff)
• testcase/tstCollector.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp

@@ -182 +182 @@
                 pcszComponent,
                 aText.c_str(),
-                aWarning,
                 preserve,
                 aResultDetail));

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

@@ -184 +184 @@
     }
 
-    LogFlowFunc(("cSamplesCaptured=%RU32, cProcessed=%RU32\n",
-                 pVRDEStrmIn->cSamplesCaptured, cProcessed, rc));
+    LogFlowFunc(("cSamplesCaptured=%RU32, cProcessed=%RU32 rc=%Rrc\n", pVRDEStrmIn->cSamplesCaptured, cProcessed, rc));
     return rc;
 }

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

@@ -315 +315 @@
 DECLCALLBACK(void *) Nvram::drvNvram_QueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
-    LogFlow(("%s pInterface:%p, pszIID:%s\n", __FUNCTION__, pInterface, pszIID));
+    LogFlowFunc(("pInterface=%p pszIID=%s\n", pInterface, pszIID));
     PPDMDRVINS pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
     PNVRAM pThis = PDMINS_2_DATA(pDrvIns, PNVRAM);
@@ -331 +331 @@
 {
     PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
-    LogFlow(("%s: iInstance/#d\n", __FUNCTION__, pDrvIns->iInstance));
+    LogFlowFunc(("iInstance/#%d\n", pDrvIns->iInstance));
     PNVRAM pThis = PDMINS_2_DATA(pDrvIns, PNVRAM);
     if (pThis->pNvram != NULL)
@@ -344 +344 @@
 {
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
-    LogFlowFunc(("iInstance/#d, pCfg:%p, fFlags:%x\n", pDrvIns->iInstance, pCfg, fFlags));
+    LogFlowFunc(("iInstance/#%d pCfg=%p fFlags=%x\n", pDrvIns->iInstance, pCfg, fFlags));
     PNVRAM pThis = PDMINS_2_DATA(pDrvIns, PNVRAM);
 

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

@@ -607 +607 @@
     PRTREQ pReq;
     int rc = RTReqQueueCall(pThis->hReqQCardReaderCmd, &pReq, 10000, (PFNRT)drvCardReaderWakeupFunc, 1, pThis);
-    AssertMsgRC(rc, ("Inserting request into queue failed rc=%Rrc\n"));
+    AssertMsgRC(rc, ("Inserting request into queue failed rc=%Rrc\n", rc));
 
     if (RT_SUCCESS(rc))

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

@@ -505 +505 @@
     if (rcv != VPX_CODEC_OK)
     {
-        LogFlow(("Failed to configure codec\n", vpx_codec_err_to_string(rcv)));
+        LogFlow(("Failed to configure codec: %s\n", vpx_codec_err_to_string(rcv)));
         return VERR_INVALID_PARAMETER;
     }

trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp

@@ -1420 +1420 @@
     int rc = RTGetOptArgvToString(&pszCmdLine, &papszArgs[cSuArgs], RTGETOPTARGV_CNV_QUOTE_BOURNE_SH);
     if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptArgvToString failed: %Rrc");
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptArgvToString failed: %Rrc", rc);
 
     /*

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -4657 +4657 @@
      HRESULT rc = S_OK;
 
-     LogFlowThisFunc(("aName=\"%s\" aControllerPort=%d aDevice=%d aType=%d aMedium=%p\n",
+     LogFlowThisFunc(("aName=\"%s\" aControllerPort=%d aDevice=%d aType=%d\n",
                       aName.c_str(), aControllerPort, aDevice, aType));
 

trunk/src/VBox/Main/src-server/Performance.cpp

@@ -402 +402 @@
                             "CGMgr");
     NOREF(rc);
-    Log7(("{%p} " LOG_FN_FMT ": RTThreadCreate returned %u (mThread=%p)\n", this, __PRETTY_FUNCTION__, rc));
+    Log7(("{%p} " LOG_FN_FMT ": RTThreadCreate returned %Rrc (mThread=%p)\n", this, __PRETTY_FUNCTION__, rc, mThread));
 }
 
@@ -820 +820 @@
     }
     else
-        LogFlowThisFunc(("Failed to collect data: %Rrc (%d).\n", rc));
+        LogFlowThisFunc(("Failed to collect data: %Rrc (%d)\n", rc, rc));
 }
 

trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp

@@ -75 +75 @@
     }
     else
-        LogRel(("NetIfAdpCtl: failed to create process for %.\n",
-                szAdpCtl));
+        LogRel(("NetIfAdpCtl: failed to create process for %s: %Rrc\n", szAdpCtl, rc));
     return rc;
 }

trunk/src/VBox/Main/testcase/tstCollector.cpp

@@ -51 +51 @@
 
 #define N_CALLS(n, fn) \
+  do {\
     for (int call = 0; call < n; ++call) \
         rc = collector->fn; \
     if (RT_FAILURE(rc)) \
-        RTPrintf("tstCollector: "#fn" -> %Rrc\n", rc)
-
-#define CALLS_PER_SECOND(fn) \
+        RTPrintf("tstCollector: "#fn" -> %Rrc\n", rc); \
+  } while (0)
+
+#define CALLS_PER_SECOND(fn, args) \
+  do { \
     nCalls = 0; \
     start = RTTimeMilliTS(); \
     do { \
-        rc = collector->fn; \
+        rc = collector->fn args; \
         if (RT_FAILURE(rc)) \
             break; \
@@ -66 +69 @@
     } while (RTTimeMilliTS() - start < RUN_TIME_MS); \
     if (RT_FAILURE(rc)) \
-    { \
         RTPrintf("tstCollector: "#fn" -> %Rrc\n", rc); \
-    } \
     else \
-        RTPrintf("%70s -- %u calls per second\n", #fn, nCalls)
+        RTPrintf("%70s -- %u calls per second\n", #fn, nCalls); \
+  } while (0)
 
 void measurePerformance(pm::CollectorHAL *collector, const char *pszName, int cVMs)
@@ -106 +108 @@
     unsigned int nCalls;
     /* Pre-collect */
-    CALLS_PER_SECOND(preCollect(hints, 0));
+    CALLS_PER_SECOND(preCollect, (hints, 0));
     /* Host CPU load */
-    CALLS_PER_SECOND(getRawHostCpuLoad(&tmp64, &tmp64, &tmp64));
+    CALLS_PER_SECOND(getRawHostCpuLoad, (&tmp64, &tmp64, &tmp64));
     /* Process CPU load */
-    CALLS_PER_SECOND(getRawProcessCpuLoad(processes[nCalls%cVMs], &tmp64, &tmp64, &tmp64));
+    CALLS_PER_SECOND(getRawProcessCpuLoad, (processes[nCalls % cVMs], &tmp64, &tmp64, &tmp64));
     /* Host CPU speed */
-    CALLS_PER_SECOND(getHostCpuMHz(&tmp));
+    CALLS_PER_SECOND(getHostCpuMHz, (&tmp));
     /* Host RAM usage */
-    CALLS_PER_SECOND(getHostMemoryUsage(&tmp, &tmp, &tmp));
+    CALLS_PER_SECOND(getHostMemoryUsage, (&tmp, &tmp, &tmp));
     /* Process RAM usage */
-    CALLS_PER_SECOND(getProcessMemoryUsage(processes[nCalls%cVMs], &tmp));
+    CALLS_PER_SECOND(getProcessMemoryUsage, (processes[nCalls % cVMs], &tmp));
 
     start = RTTimeNanoTS();