Changeset 67551 in vbox

Timestamp:

Jun 22, 2017 8:06:06 AM (8 years ago)

Author:

vboxsync

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

116297

Message:

DrvHostPulseAudio: logging, locking

File:

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

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

@@ -87 +87 @@
     /** Shutdown indicator. */
     volatile bool         fAbortLoop;
-    /** Abort wait loop during enumeration. */
-    volatile bool         fAbortEnumLoop;
+    /** Enumeration operation successful? */
+    volatile bool         fEnumOpSuccess;
     /** Pointer to host audio interface. */
     PDMIHOSTAUDIO         IHostAudio;
@@ -191 +191 @@
 
     pThis->fAbortLoop = true;
-    pThis->fAbortEnumLoop = true;
     pa_threaded_mainloop_signal(pThis->pMainLoop, 0);
 }
@@ -273 +272 @@
  * Synchronously wait until an operation completed.
  */
-static int paWaitForEx(PDRVHOSTPULSEAUDIO pThis, pa_operation *pOP, RTMSINTERVAL cMsTimeout, bool fDebug)
+static int paWaitForEx(PDRVHOSTPULSEAUDIO pThis, pa_operation *pOP, RTMSINTERVAL cMsTimeout)
 {
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
     AssertPtrReturn(pOP,   VERR_INVALID_POINTER);
-    NOREF(fDebug);
 
     int rc = VINF_SUCCESS;
-    pThis->fAbortEnumLoop = false;
 
     uint64_t u64StartMs = RTTimeMilliTS();
@@ -288 +285 @@
         {
             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;
             if (   !pThis->pContext
                 || pa_context_get_state(pThis->pContext) != PA_CONTEXT_READY)
@@ -318 +309 @@
 
 
-static int paWaitFor(PDRVHOSTPULSEAUDIO pThis, pa_operation *pOP, bool fDebug = false)
-{
-    return paWaitForEx(pThis, pOP, 10 * 1000 /* 10s timeout */, fDebug);
+static int paWaitFor(PDRVHOSTPULSEAUDIO pThis, pa_operation *pOP)
+{
+    return paWaitForEx(pThis, pOP, 10 * 1000 /* 10s timeout */);
 }
 
@@ -947 +938 @@
 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;
@@ -960 +947 @@
     if (eol < 0)
     {
-        pThis->fAbortEnumLoop = true;
+        pThis->fEnumOpSuccess = false;
         pa_threaded_mainloop_signal(pCbCtx->pDrv->pMainLoop, 0);
-        LogRel(("PulseAudio: paEnumSinkCb eol=%d, signalling\n", eol));
         return;
     }
@@ -974 +960 @@
     pCbCtx->cDevOut++;
 
-    LogRel(("PulseAudio: paEnumSinkCb signalling\n"));
+    pThis->fEnumOpSuccess = true;
     pa_threaded_mainloop_signal(pCbCtx->pDrv->pMainLoop, 0);
 }
@@ -981 +967 @@
 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;
@@ -994 +976 @@
     if (eol < 0)
     {
-        pThis->fAbortEnumLoop = true;
+        pThis->fEnumOpSuccess = false;
         pa_threaded_mainloop_signal(pCbCtx->pDrv->pMainLoop, 0);
-        LogRel(("PulseAudio: paEnumSourceCb eol=%d, signalling\n", eol));
         return;
     }
@@ -1008 +989 @@
     pCbCtx->cDevIn++;
 
-    LogRel(("PulseAudio: paEnumSourceCb signalling\n"));
+    pThis->fEnumOpSuccess = true;
     pa_threaded_mainloop_signal(pCbCtx->pDrv->pMainLoop, 0);
 }
@@ -1015 +996 @@
 static void paEnumServerCb(pa_context *pCtx, const pa_server_info *pInfo, void *pvUserData)
 {
-    LogRel(("PulseAudio: entering paEnumServerCb\n"));
-
     AssertPtrReturnVoid(pCtx);
     PPULSEAUDIOENUMCBCTX pCbCtx = (PPULSEAUDIOENUMCBCTX)pvUserData;
@@ -1025 +1004 @@
     if (!pInfo)
     {
-        pThis->fAbortEnumLoop = true;
-        LogRel(("PulseAudio: paEnumServerCb no info, signalling\n"));
+        pThis->fEnumOpSuccess = false;
         pa_threaded_mainloop_signal(pCbCtx->pDrv->pMainLoop, 0);
         return;
@@ -1043 +1021 @@
     }
 
-    LogRel(("PulseAudio: paEnumServerCb signalling\n"));
+    pThis->fEnumOpSuccess = true;
     pa_threaded_mainloop_signal(pThis->pMainLoop, 0);
 }
@@ -1069 +1047 @@
     bool fLog = (fEnum & PULSEAUDIOENUMCBFLAGS_LOG);
 
+    pa_threaded_mainloop_lock(pThis->pMainLoop);
+
     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)
+    pThis->fEnumOpSuccess = false;
+    int rc = paWaitFor(pThis, pa_context_get_server_info(pThis->pContext, paEnumServerCb, &CbCtx));
+    LogRel(("PulseAudio: server enumeration done rc=%Rrc success=%d\n", rc, pThis->fEnumOpSuccess));
+    if (RT_SUCCESS(rc) && !pThis->fEnumOpSuccess)
         rc = VERR_AUDIO_BACKEND_INIT_FAILED; /* error code does not matter */
     if (RT_SUCCESS(rc))
@@ -1083 +1063 @@
 
             LogRel(("PulseAudio: starting sink enumeration\n"));
+            pThis->fEnumOpSuccess = false;
             rc = paWaitFor(pThis, pa_context_get_sink_info_by_name(pThis->pContext, CbCtx.pszDefaultSink,
-                                                                   paEnumSinkCb, &CbCtx), true);
-            LogRel(("PulseAudio: sink enumeration done rc=%Rrc abort=%d\n", rc, pThis->fAbortEnumLoop));
-            if (   RT_SUCCESS(rc)
-                && pThis->fAbortEnumLoop)
+                                                                   paEnumSinkCb, &CbCtx));
+            LogRel(("PulseAudio: sink enumeration done rc=%Rrc success=%d\n", rc, pThis->fEnumOpSuccess));
+            if (RT_SUCCESS(rc) && !pThis->fEnumOpSuccess)
                 rc = VERR_AUDIO_BACKEND_INIT_FAILED; /* error code does not matter */
             if (   RT_FAILURE(rc)
@@ -1106 +1086 @@
 
                 LogRel(("PulseAudio: starting source enumeration\n"));
+                pThis->fEnumOpSuccess = false;
                 rc = paWaitFor(pThis, pa_context_get_source_info_by_name(pThis->pContext, CbCtx.pszDefaultSource,
-                                                                         paEnumSourceCb, &CbCtx), true);
-                LogRel(("PulseAudio: source enumeration done rc=%Rrc abort=%d\n", rc, pThis->fAbortEnumLoop));
-                if (   RT_FAILURE(rc)
+                                                                         paEnumSourceCb, &CbCtx));
+                LogRel(("PulseAudio: source enumeration done rc=%Rrc success=%d\n", rc, pThis->fEnumOpSuccess));
+                if (   (RT_FAILURE(rc) || !pThis->fEnumOpSuccess)
                     && fLog)
                 {
@@ -1145 +1126 @@
     else if (fLog)
         LogRel(("PulseAudio: Error enumerating PulseAudio server properties\n"));
+    
+    pa_threaded_mainloop_unlock(pThis->pMainLoop);
 
     LogFlowFuncLeaveRC(rc);