Changeset 89425 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Jun 1, 2021 10:22:23 AM (4 years ago)

Author:

vboxsync

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

144778

Message:

DrvHostAudioAlsaStubs: Use RTOnce to make the init thread-safe and all. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioAlsaStubs.cpp (modified) (2 diffs)

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

@@ -18 +18 @@
 #define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO
 #include <iprt/assert.h>
+#include <iprt/err.h>
 #include <iprt/ldr.h>
 #include <VBox/log.h>
-#include <iprt/err.h>
+#include <iprt/once.h>
 
 #include <alsa/asoundlib.h>
@@ -239 +240 @@
 #undef ELEMENT
 
-/**
- * Try to dynamically load the ALSA libraries.  This function is not
- * thread-safe, and should be called before attempting to use any of the
- * ALSA functions.
- *
- * @returns iprt status code
- */
-int audioLoadAlsaLib(void)
-{
-    static enum { NO = 0, YES, FAIL } isLibLoaded = NO;
-    RTLDRMOD hLib;
-
+/** Init once. */
+static RTONCE g_AlsaLibInitOnce = RTONCE_INITIALIZER;
+
+
+/** @callback_method_impl{FNRTONCE} */
+static DECLCALLBACK(int32_t) drvHostAudioAlsaLibInitOnce(void *pvUser)
+{
+    RT_NOREF(pvUser);
     LogFlowFunc(("\n"));
-    /* If this is not NO then the function has obviously been called twice,
-       which is likely to be a bug. */
-    if (NO != isLibLoaded)
+
+    RTLDRMOD hMod = NIL_RTLDRMOD;
+    int rc = RTLdrLoadSystemEx(VBOX_ALSA_LIB, RTLDRLOAD_FLAGS_NO_UNLOAD, &hMod);
+    if (RT_SUCCESS(rc))
     {
-        AssertMsgFailed(("isLibLoaded == %s\n", YES == isLibLoaded ? "YES" : "NO"));
-        return YES == isLibLoaded ? VINF_SUCCESS : VERR_NOT_SUPPORTED;
-    }
-    isLibLoaded = FAIL;
-    int rc = RTLdrLoad(VBOX_ALSA_LIB, &hLib);
-    if (RT_FAILURE(rc))
-    {
-        LogRelFunc(("Failed to load library %s (%Rrc)\n", VBOX_ALSA_LIB, rc));
-        return rc;
-    }
-    for (uintptr_t i = 0; i < RT_ELEMENTS(SharedFuncs); i++)
-    {
-        rc = RTLdrGetSymbol(hLib, SharedFuncs[i].name, (void **)SharedFuncs[i].pfn);
-        if (RT_SUCCESS(rc))
-        { /* likely */ }
-        else if (SharedFuncs[i].pfnFallback && rc == VERR_SYMBOL_NOT_FOUND)
-            *SharedFuncs[i].pfn = SharedFuncs[i].pfnFallback;
-        else
+        for (uintptr_t i = 0; i < RT_ELEMENTS(SharedFuncs); i++)
         {
-            LogRelFunc(("Failed to load library %s: Getting symbol %s failed: %Rrc\n", VBOX_ALSA_LIB, SharedFuncs[i].name, rc));
-            return rc;
+            rc = RTLdrGetSymbol(hMod, SharedFuncs[i].name, (void **)SharedFuncs[i].pfn);
+            if (RT_SUCCESS(rc))
+            { /* likely */ }
+            else if (SharedFuncs[i].pfnFallback && rc == VERR_SYMBOL_NOT_FOUND)
+                *SharedFuncs[i].pfn = SharedFuncs[i].pfnFallback;
+            else
+            {
+                LogRelFunc(("Failed to load library %s: Getting symbol %s failed: %Rrc\n", VBOX_ALSA_LIB, SharedFuncs[i].name, rc));
+                return rc;
+            }
         }
     }
-    isLibLoaded = YES;
+    else
+        LogRelFunc(("Failed to load library %s (%Rrc)\n", VBOX_ALSA_LIB, rc));
     return rc;
 }
 
+
+/**
+ * Try to dynamically load the ALSA libraries.
+ *
+ * @returns VBox status code.
+ */
+int audioLoadAlsaLib(void)
+{
+    LogFlowFunc(("\n"));
+    return RTOnce(&g_AlsaLibInitOnce, drvHostAudioAlsaLibInitOnce, NULL);
+}
+