Changeset 67520 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 21, 2017 6:59:46 AM (8 years ago)

Author:

vboxsync

Message:

DrvHostPulseAudio: more debugging

File:

• trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp (modified) (15 diffs)

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

@@ -273 +273 @@
  * Synchronously wait until an operation completed.
  */
-static int paWaitForEx(PDRVHOSTPULSEAUDIO pThis, pa_operation *pOP, RTMSINTERVAL cMsTimeout)
+static int paWaitForEx(PDRVHOSTPULSEAUDIO pThis, pa_operation *pOP, RTMSINTERVAL cMsTimeout, bool fDebug)
 {
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
@@ -287 +287 @@
         {
             AssertPtr(pThis->pMainLoop);
+            if (fDebug)
+                LogRel(("PulseAudio: pa_threaded_mainloop_wait\n"));
             pa_threaded_mainloop_wait(pThis->pMainLoop);
+            if (fDebug)
+                LogRel(("PulseAudio: pa_threaded_mainloop_wait done\n"));
             if (pThis->fAbortEnumLoop)
                 break;
@@ -307 +311 @@
 
 
-static int paWaitFor(PDRVHOSTPULSEAUDIO pThis, pa_operation *pOP)
-{
-    return paWaitForEx(pThis, pOP, 10 * 1000 /* 10s timeout */);
+static int paWaitFor(PDRVHOSTPULSEAUDIO pThis, pa_operation *pOP, bool fDebug = false)
+{
+    return paWaitForEx(pThis, pOP, 10 * 1000 /* 10s timeout */, fDebug);
 }
 
@@ -935 +939 @@
 static void paEnumSinkCb(pa_context *pCtx, const pa_sink_info *pInfo, int eol, void *pvUserData)
 {
+    LogRel(("PulseAudio: entering paEnumSinkCb\n"));
     if (eol > 0)
+    {
+        LogRel(("PulseAudio: paEnumSinkCb: eol=%d\n", eol));
         return;
+    }
 
     PPULSEAUDIOENUMCBCTX pCbCtx = (PPULSEAUDIOENUMCBCTX)pvUserData;
@@ -946 +954 @@
         pThis->fAbortEnumLoop = true;
         pa_threaded_mainloop_signal(pCbCtx->pDrv->pMainLoop, 0);
+        LogRel(("PulseAudio: paEnumSinkCb eol=%d, signalling\n", eol));
         return;
     }
@@ -957 +966 @@
     pCbCtx->cDevOut++;
 
+    LogRel(("PulseAudio: paEnumSinkCb signalling\n"));
     pa_threaded_mainloop_signal(pCbCtx->pDrv->pMainLoop, 0);
 }
@@ -963 +973 @@
 static void paEnumSourceCb(pa_context *pCtx, const pa_source_info *pInfo, int eol, void *pvUserData)
 {
+    LogRel(("PulseAudio: entering paEnumSourceCb\n"));
     if (eol > 0)
+    {
+        LogRel(("PulseAudio: paEnumSourceCb: eol=%d\n", eol));
         return;
+    }
 
     PPULSEAUDIOENUMCBCTX pCbCtx = (PPULSEAUDIOENUMCBCTX)pvUserData;
@@ -974 +988 @@
         pThis->fAbortEnumLoop = true;
         pa_threaded_mainloop_signal(pCbCtx->pDrv->pMainLoop, 0);
+        LogRel(("PulseAudio: paEnumSourceCb eol=%d, signalling\n", eol));
         return;
     }
@@ -985 +1000 @@
     pCbCtx->cDevIn++;
 
+    LogRel(("PulseAudio: paEnumSourceCb signalling\n"));
     pa_threaded_mainloop_signal(pCbCtx->pDrv->pMainLoop, 0);
 }
@@ -991 +1007 @@
 static void paEnumServerCb(pa_context *pCtx, const pa_server_info *pInfo, void *pvUserData)
 {
+    LogRel(("PulseAudio: entering paEnumServerCb\n"));
+
     AssertPtrReturnVoid(pCtx);
     PPULSEAUDIOENUMCBCTX pCbCtx = (PPULSEAUDIOENUMCBCTX)pvUserData;
@@ -1000 +1018 @@
     {
         pThis->fAbortEnumLoop = true;
+        LogRel(("PulseAudio: paEnumServerCb no info, signalling\n"));
         pa_threaded_mainloop_signal(pCbCtx->pDrv->pMainLoop, 0);
         return;
@@ -1016 +1035 @@
     }
 
+    LogRel(("PulseAudio: paEnumServerCb signalling\n"));
     pa_threaded_mainloop_signal(pThis->pMainLoop, 0);
 }
@@ -1041 +1061 @@
     bool fLog = (fEnum & PULSEAUDIOENUMCBFLAGS_LOG);
 
-    int rc = paWaitFor(pThis, pa_context_get_server_info(pThis->pContext, paEnumServerCb, &CbCtx));
+    LogRel(("PulseAudio: starting server enumeration\n"));
+    int rc = paWaitFor(pThis, pa_context_get_server_info(pThis->pContext, paEnumServerCb, &CbCtx), true);
+    LogRel(("PulseAudio: server enumeration done rc=%Rrc abort=%d\n", rc, pThis->fAbortEnumLoop));
     if (   RT_SUCCESS(rc)
         && pThis->fAbortEnumLoop)
@@ -1052 +1074 @@
                 LogRel2(("PulseAudio: Default output sink is '%s'\n", CbCtx.pszDefaultSink));
 
+            LogRel(("PulseAudio: starting sink enumeration\n"));
             rc = paWaitFor(pThis, pa_context_get_sink_info_by_name(pThis->pContext, CbCtx.pszDefaultSink,
-                                                                   paEnumSinkCb, &CbCtx));
+                                                                   paEnumSinkCb, &CbCtx), true);
+            LogRel(("PulseAudio: sink enumeration done rc=%Rrc abort=%d\n", rc, pThis->fAbortEnumLoop));
             if (   RT_SUCCESS(rc)
                 && pThis->fAbortEnumLoop)
@@ -1073 +1097 @@
                     LogRel2(("PulseAudio: Default input source is '%s'\n", CbCtx.pszDefaultSource));
 
+                LogRel(("PulseAudio: starting source enumeration\n"));
                 rc = paWaitFor(pThis, pa_context_get_source_info_by_name(pThis->pContext, CbCtx.pszDefaultSource,
-                                                                         paEnumSourceCb, &CbCtx));
+                                                                         paEnumSourceCb, &CbCtx), true);
+                LogRel(("PulseAudio: source enumeration done rc=%Rrc abort=%d\n", rc, pThis->fAbortEnumLoop));
                 if (   RT_FAILURE(rc)
                     && fLog)