Changeset 28361 in vbox

Timestamp:

Apr 15, 2010 1:46:02 PM (15 years ago)

Author:

vboxsync

Message:

Runtime/runtime-loader: use RTOnce again

File:

• trunk/include/iprt/runtime-loader.h (modified) (3 diffs)

trunk/include/iprt/runtime-loader.h

@@ -64 +64 @@
  * probably be preferable. */
 
-#include <iprt/asm.h>
-#include <iprt/assert.h>
-#include <iprt/cdefs.h>
-#include <iprt/err.h>
 #include <iprt/ldr.h>
 #include <iprt/log.h>
-#include <iprt/thread.h>
-#include <iprt/types.h>
+#include <iprt/once.h>
 
 #ifdef RT_RUNTIME_LOADER_GENERATE_BODY_STUBS
@@ -99 +94 @@
 # undef RT_PROXY_STUB
 
-enum RT_RTLDR_LOAD_STATE
+/* The function which does the actual work for RT_RUNTIME_LOADER_FUNCTION,
+ * serialised for thread safety. */
+static int rtldrLoadOnce(void *, void *)
 {
-    UNLOADED = 0,
-    LOADING,
-    DONE
-};
+    RTLDRMOD hLib;
 
-static uint32_t rtldrState = UNLOADED;
-static uint32_t rtldrRC = VERR_WRONG_ORDER;
+    LogFlowFunc(("\n"));
+    int rc = RTLdrLoad(RT_RUNTIME_LOADER_LIB_NAME, &hLib);
+    for (unsigned i = 0; RT_SUCCESS(rc) && SharedFuncs[i].name != NULL; ++i)
+        rc = RTLdrGetSymbol(hLib, SharedFuncs[i].name, (void**)SharedFuncs[i].fn);
+    LogFlowFunc(("rc = %Rrc\n", rc));
+    return rc;
+}
 
 /** Load the shared library RT_RUNTIME_LOADER_LIB_NAME and resolve the symbols
@@ -115 +114 @@
 RTR3DECL(int) RT_RUNTIME_LOADER_FUNCTION(void)
 {
-    int rc;
+    static RTONCE sOnce = RTONCE_INITIALIZER;
 
     LogFlowFunc(("\n"));
-    if (ASMAtomicCmpXchgU32(&rtldrState, LOADING, UNLOADED))
-    {
-        RTLDRMOD hLib;
-
-        rc = RTLdrLoad(RT_RUNTIME_LOADER_LIB_NAME, &hLib);
-        for (unsigned i = 0; RT_SUCCESS(rc) && SharedFuncs[i].name != NULL; ++i)
-            rc = RTLdrGetSymbol(hLib, SharedFuncs[i].name, (void**)SharedFuncs[i].fn);
-        rtldrRC = rc;
-        rtldrState = DONE;
-    }
-    else
-    {
-        while(rtldrState == LOADING)
-            RTThreadYield();
-        rc = rtldrRC;
-    }
-    Assert(rtldrState == DONE);
+    int rc = RTOnce (&sOnce, rtldrLoadOnce, NULL, NULL);
     LogFlowFunc(("rc = %Rrc\n", rc));
     return rc;
 }
+
 #elif defined(RT_RUNTIME_LOADER_GENERATE_HEADER)
 # ifdef RT_RUNTIME_LOADER_GENERATE_DECLS