Changeset 61089 in vbox for trunk/src/VBox

Timestamp:

May 20, 2016 10:05:27 AM (9 years ago)

Author:

vboxsync

Message:

Audio/AudioMixBuffer: Added some more debug code for buffer statistics.

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixBuffer.cpp (modified) (11 diffs)
• AudioMixBuffer.h (modified) (2 diffs)

trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp

@@ -158 +158 @@
 #ifdef DEBUG
 static uint64_t s_cSamplesMixedTotal = 0;
-static inline void audioMixBufPrint(PPDMAUDIOMIXBUF pMixBuf);
+static inline void audioMixBufDbgPrint(PPDMAUDIOMIXBUF pMixBuf);
 #endif
 
@@ -872 +872 @@
     if (pMixBuf->pParent) /* Already linked? */
     {
-        AUDMIXBUF_LOG(("%s: Already linked to \"%s\"\n",
+        AUDMIXBUF_LOG(("%s: Already linked to parent '%s'\n",
                        pMixBuf->pszName, pMixBuf->pParent->pszName));
         return VERR_ACCESS_DENIED;
@@ -1068 +1068 @@
 #ifdef DEBUG
     s_cSamplesMixedTotal += cWrittenTotal;
-    audioMixBufPrint(pDst);
+    AudioMixBufDbgPrint(pDst);
 #endif
 
@@ -1140 +1140 @@
 
 #ifdef DEBUG
+static void audioMixBufDbgBufPrintIndentV(uint16_t uIndent, const char *pszFormat, va_list va)
+{
+    char *pszValueFormat;
+    if (RTStrAPrintfV(&pszValueFormat, pszFormat, va))
+    {
+        AUDMIXBUF_LOG(("%*s%s", uIndent, "", pszValueFormat));
+        RTStrFree(pszValueFormat);
+    }
+}
+
+static void audioMixBufDbgPrintIndent(uint16_t uIdtLvl, const char *pszFormat, ...)
+{
+    va_list va;
+    va_start(va, pszFormat);
+    audioMixBufDbgBufPrintIndentV(uIdtLvl * 4, pszFormat, va);
+    va_end(va);
+}
+
+/**
+ * Prints a single mixing buffer.
+ * Internal helper function for debugging. Do not use directly.
+ *
+ * @return  IPRT status code.
+ * @param   pMixBuf                 Mixing buffer to print.
+ * @param   fIsParent               Whether this is a parent buffer or not.
+ * @param   uIdtLvl                 Indention level to use.
+ */
+static void audioMixBufDbgPrintSingle(PPDMAUDIOMIXBUF pMixBuf, bool fIsParent, uint16_t uIdtLvl)
+{
+    audioMixBufDbgPrintIndent(uIdtLvl,
+                           "[%s] %s (%RU32): offReadWrite=%RU32, cProcessed=%RU32, cMixed=%RU32 (BpS=%RU32)\n",
+                           fIsParent ? "PARENT" : "CHILD",
+                           pMixBuf->pszName, pMixBuf->cSamples,
+                           pMixBuf->offReadWrite, pMixBuf->cProcessed, pMixBuf->cMixed,
+                           AUDIOMIXBUF_S2B(pMixBuf, 1));
+}
+
+/**
+ * Internal helper function for audioMixBufPrintChain().
+ * Do not use directly.
+ *
+ * @return  IPRT status code.
+ * @param   pMixBuf                 Mixing buffer to print.
+ * @param   uIdtLvl                 Indention level to use.
+ * @param   pcChildren              Pointer to children counter.
+ */
+static void audioMixBufDbgPrintChainHelper(PPDMAUDIOMIXBUF pMixBuf, uint16_t uIdtLvl, size_t *pcChildren)
+{
+    PPDMAUDIOMIXBUF pIter;
+    RTListForEach(&pMixBuf->lstBuffers, pIter, PDMAUDIOMIXBUF, Node)
+    {
+        audioMixBufDbgPrintSingle(pIter, false /* ifIsParent */, uIdtLvl + 1);
+        audioMixBufDbgPrintChainHelper(pIter, uIdtLvl + 1, pcChildren);
+    }
+}
+
+/**
+ * Prints statistics and status of the full chain of a mixing buffer to the logger,
+ * starting from the top root mixing buffer.
+ * For debug versions only.
+ *
+ * @return  IPRT status code.
+ * @param   pMixBuf                 Mixing buffer to print.
+ */
+void AudioMixBufDbgPrintChain(PPDMAUDIOMIXBUF pMixBuf)
+{
+    PPDMAUDIOMIXBUF pParent = pMixBuf->pParent;
+    while (pParent)
+    {
+        if (!pParent->pParent)
+            break;
+
+        pParent = pParent->pParent;
+    }
+
+    if (!pParent)
+        pParent = pMixBuf;
+
+    AUDMIXBUF_LOG(("********************************************\n"));
+
+    audioMixBufDbgPrintSingle(pParent, true /* fIsParent */, 0 /* uIdtLvl */);
+
+    /* Recursively iterate children. */
+    size_t cChildren = 0;
+    audioMixBufDbgPrintChainHelper(pParent, 0 /* uIdtLvl */, &cChildren);
+
+    AUDMIXBUF_LOG(("Children: %zu - Total samples mixed: %RU64\n", cChildren, s_cSamplesMixedTotal));
+    AUDMIXBUF_LOG(("********************************************\n"));
+}
+
 /**
  * Prints statistics and status of a mixing buffer to the logger.
@@ -1147 +1237 @@
  * @param   pMixBuf                 Mixing buffer to print.
  */
-static inline void audioMixBufPrint(PPDMAUDIOMIXBUF pMixBuf)
+void AudioMixBufDbgPrint(PPDMAUDIOMIXBUF pMixBuf)
 {
     PPDMAUDIOMIXBUF pParent = pMixBuf;
@@ -1154 +1244 @@
 
     AUDMIXBUF_LOG(("********************************************\n"));
-    AUDMIXBUF_LOG(("[PARENT] %s (%RU32): offReadWrite=%RU32, cProcessed=%RU32, cMixed=%RU32 (BpS=%RU32)\n",
-                   pParent->pszName, pParent->cSamples,
-                   pParent->offReadWrite, pParent->cProcessed, pParent->cMixed,
-                   AUDIOMIXBUF_S2B(pParent, 1)));
-
-    size_t cChildren = 0;
+
+    audioMixBufDbgPrintSingle(pMixBuf, true /* fIsParent */, 0 /* iIdtLevel */);
 
     PPDMAUDIOMIXBUF pIter;
     RTListForEach(&pParent->lstBuffers, pIter, PDMAUDIOMIXBUF, Node)
-    {
-        AUDMIXBUF_LOG(("\t[CHILD] %s (%RU32): offReadWrite=%RU32, cProcessed=%RU32, cMixed=%RU32 (BpS=%RU32)\n",
-                       pIter->pszName, pIter->cSamples,
-                       pIter->offReadWrite, pIter->cProcessed, pIter->cMixed,
-                       AUDIOMIXBUF_S2B(pIter, 1)));
-        cChildren++;
-    }
-    AUDMIXBUF_LOG(("Children: %zu - Total samples mixed: %RU64\n", cChildren, s_cSamplesMixedTotal));
-    AUDMIXBUF_LOG(("********************************************\n"));
+        audioMixBufDbgPrintSingle(pMixBuf, false /* fIsParent */, 1 /* iIdtLevel */);
 }
 #endif
@@ -1255 +1333 @@
 
 #ifdef DEBUG
-        audioMixBufPrint(pMixBuf);
+        AudioMixBufDbgPrint(pMixBuf);
 #endif
     }
@@ -1317 +1395 @@
     {
 #ifdef DEBUG
-        audioMixBufPrint(pMixBuf);
+        AudioMixBufDbgPrint(pMixBuf);
 #endif
         if (pcRead)
@@ -1400 +1478 @@
 
 #ifdef DEBUG
-    audioMixBufPrint(pMixBuf);
+    AudioMixBufDbgPrint(pMixBuf);
 #endif
 
@@ -1597 +1675 @@
         cWritten = pConv(pMixBuf->pSamples + offSamples, pvBuf, cbBuf, &convOpts);
 #ifdef DEBUG
-        audioMixBufPrint(pMixBuf);
+        AudioMixBufDbgPrint(pMixBuf);
 #endif
         rc = cWritten ? VINF_SUCCESS : VERR_GENERAL_FAILURE; /** @todo Fudge! */
@@ -1754 +1832 @@
 
 #ifdef DEBUG
-    audioMixBufPrint(pMixBuf);
+    AudioMixBufDbgPrint(pMixBuf);
 #endif
 

trunk/src/VBox/Devices/Audio/AudioMixBuffer.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2014-2015 Oracle Corporation
+ * Copyright (C) 2014-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -79 +79 @@
 int AudioMixBufWriteCircEx(PPDMAUDIOMIXBUF pMixBuf, PDMAUDIOMIXBUFFMT enmFmt, const void *pvBuf, uint32_t cbBuf, uint32_t *pcWritten);
 
+#ifdef DEBUG
+void AudioMixBufDbgPrint(PPDMAUDIOMIXBUF pMixBuf);
+void AudioMixBufDbgPrintChain(PPDMAUDIOMIXBUF pMixBuf);
+#endif
+
 #endif /* AUDIO_MIXBUF_H */