Changeset 96442 in vbox

Timestamp:

Aug 23, 2022 2:12:35 PM (2 years ago)

Author:

vboxsync

Message:

IPRT: Split out the public init data into separate files and made it possible to check if IPRT is initialized w/o dragging in the init code. Added tweak to stream.cpp so it'll work w/o IPRT init in debug builds. bugref:10261

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• include/internal/initterm.h (modified) (1 diff)
• include/internal/process.h (modified) (1 diff)
• r3/init-data.cpp (added)
• r3/init.cpp (modified) (8 diffs)
• r3/path.cpp (modified) (1 diff)
• r3/process-data.cpp (added)
• r3/stream.cpp (modified) (2 diffs)
• r3/win/nocrt-startup-common-win.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -780 +780 @@
         r3/http-server.cpp \
         r3/init.cpp \
+        r3/init-data.cpp \
+        r3/process-data.cpp \
         r3/memsafer-r3.cpp \
         r3/path.cpp \
@@ -2437 +2439 @@
         r3/generic/semspinmutex-r3-generic.cpp \
         r3/init.cpp \
+        r3/init-data.cpp \
+        r3/process-data.cpp \
         r3/memsafer-r3.cpp \
         r3/path.cpp \

trunk/src/VBox/Runtime/include/internal/initterm.h

@@ -66 +66 @@
 #endif /* IN_RING0 */
 
+#ifdef IN_RING3
+
+extern DECL_HIDDEN_DATA(int32_t volatile)   g_crtR3Users;
+extern DECL_HIDDEN_DATA(bool volatile)      g_frtR3Initializing;
+extern DECL_HIDDEN_DATA(bool volatile)      g_frtAtExitCalled;
+
+/**
+ * Internal version of RTR3InitIsInitialized.
+ */
+DECLINLINE(bool) rtInitIsInitialized(void)
+{
+    return g_crtR3Users >= 1 && !g_frtR3Initializing;
+}
+
+#endif
+
 RT_C_DECLS_END
 

trunk/src/VBox/Runtime/include/internal/process.h

@@ -50 +50 @@
 extern DECL_HIDDEN_DATA(char)           g_szrtProcExePath[RTPATH_MAX];
 extern DECL_HIDDEN_DATA(size_t)         g_cchrtProcExePath;
-extern DECL_HIDDEN_DATA(size_t)         g_cchrtProcDir;
+extern DECL_HIDDEN_DATA(size_t)         g_cchrtProcExeDir;
 extern DECL_HIDDEN_DATA(size_t)         g_offrtProcName;
-extern DECL_HIDDEN_DATA(bool volatile)  g_frtAtExitCalled;
 
 /**

trunk/src/VBox/Runtime/r3/init.cpp

@@ -85 +85 @@
 #include "init.h"
 #include "internal/alignmentchecks.h"
+#include "internal/initterm.h"
 #include "internal/path.h"
 #include "internal/process.h"
@@ -94 +95 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-/** The number of calls to RTR3Init*. */
-static int32_t volatile     g_cUsers = 0;
-/** Whether we're currently initializing the IPRT. */
-static bool volatile        g_fInitializing = false;
-
-#if !defined(IPRT_NO_CRT) || !defined(RT_OS_WINDOWS)
-/** The process path.
- * This is used by RTPathExecDir and RTProcGetExecutablePath and set by rtProcInitName. */
-DECL_HIDDEN_DATA(char)      g_szrtProcExePath[RTPATH_MAX];
-/** The length of g_szrtProcExePath. */
-DECL_HIDDEN_DATA(size_t)    g_cchrtProcExePath;
-/** The offset of the process name into g_szrtProcExePath. */
-DECL_HIDDEN_DATA(size_t)    g_offrtProcName;
-#endif
-/** The length of directory path component of g_szrtProcExePath. */
-DECL_HIDDEN_DATA(size_t)    g_cchrtProcDir;
-
 /** The IPRT init flags. */
 static uint32_t             g_fInitFlags;
@@ -121 +105 @@
 static char **              g_papszrtOrgArgs;
 
-/**
- * Program start nanosecond TS.
- */
-DECL_HIDDEN_DATA(uint64_t)  g_u64ProgramStartNanoTS;
-
-/**
- * The process identifier of the running process.
- */
-DECL_HIDDEN_DATA(RTPROCESS) g_ProcessSelf = NIL_RTPROCESS;
-
-/**
- * The current process priority.
- */
-DECL_HIDDEN_DATA(RTPROCPRIORITY)  g_enmProcessPriority = RTPROCPRIORITY_DEFAULT;
-
-/**
- * Set if the atexit callback has been called, i.e. indicating
- * that the process is terminating.
- */
-DECL_HIDDEN_DATA(bool volatile)   g_frtAtExitCalled = false;
-
 #ifdef IPRT_WITH_ALIGNMENT_CHECKS
 /**
@@ -170 +133 @@
     ASMAtomicWriteBool(&g_frtAtExitCalled, true);
 
-    if (g_cUsers > 0)
+    if (g_crtR3Users > 0)
     {
         PRTLOGGER pLogger = RTLogGetDefaultInstance();
@@ -249 +212 @@
      */
     ssize_t offName;
-    g_cchrtProcExePath = RTPathParseSimple(g_szrtProcExePath, &g_cchrtProcDir, &offName, NULL);
+    g_cchrtProcExePath = RTPathParseSimple(g_szrtProcExePath, &g_cchrtProcExeDir, &offName, NULL);
     g_offrtProcName = offName;
     return VINF_SUCCESS;
@@ -599 +562 @@
      * first one, the real init, is running (second assertion).
      */
-    int32_t cUsers = ASMAtomicIncS32(&g_cUsers);
+    int32_t cUsers = ASMAtomicIncS32(&g_crtR3Users);
     if (cUsers != 1)
     {
         AssertMsg(cUsers > 1, ("%d\n", cUsers));
-        Assert(!g_fInitializing);
+        Assert(!g_frtR3Initializing);
 
 #if !defined(IN_GUEST) && !defined(RT_NO_GIP)
@@ -640 +603 @@
      * Do the initialization.
      */
-    ASMAtomicWriteBool(&g_fInitializing, true);
+    ASMAtomicWriteBool(&g_frtR3Initializing, true);
     int rc = rtR3InitBody(fFlags, cArgs, ppapszArgs, pszProgramPath);
-    ASMAtomicWriteBool(&g_fInitializing, false);
+    ASMAtomicWriteBool(&g_frtR3Initializing, false);
     if (RT_FAILURE(rc))
     {
         /* failure */
-        ASMAtomicDecS32(&g_cUsers);
+        ASMAtomicDecS32(&g_crtR3Users);
         return rc;
     }
@@ -686 +649 @@
 RTR3DECL(bool) RTR3InitIsInitialized(void)
 {
-    return g_cUsers >= 1 && !g_fInitializing;
+    return g_crtR3Users >= 1 && !g_frtR3Initializing;
 }
 

trunk/src/VBox/Runtime/r3/path.cpp

@@ -79 +79 @@
      * Calc the length and check if there is space before copying.
      */
-    size_t cch = g_cchrtProcDir;
+    size_t cch = g_cchrtProcExeDir;
     if (cch < cchPath)
     {

trunk/src/VBox/Runtime/r3/stream.cpp

@@ -89 +89 @@
 #include "internal/alignmentchecks.h"
 #include "internal/magics.h"
+#ifdef IPRT_NO_CRT
+# include "internal/initterm.h"
+#endif
 
 #ifdef RTSTREAM_STANDALONE
@@ -362 +365 @@
 
     /* The native stream lock are normally not recursive. */
-    int rc = RTCritSectInitEx(pCritSect, RTCRITSECT_FLAGS_NO_NESTING,
-                              NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_NONE, "RTSemSpinMutex");
+    uint32_t fFlags = RTCRITSECT_FLAGS_NO_NESTING;
+# ifdef IPRT_NO_CRT
+    /* IPRT is often used deliberatly without initialization in no-CRT
+       binaries (for instance VBoxAddInstallNt3x.exe), so in order to avoid
+       asserting in the lock validator we add the bootstrap hack that disable
+       lock validation for the section. */
+    if (!rtInitIsInitialized())
+        fFlags |= RTCRITSECT_FLAGS_BOOTSTRAP_HACK;
+# endif
+    int rc = RTCritSectInitEx(pCritSect, fFlags, NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_NONE, "RTSemSpinMutex");
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Runtime/r3/win/nocrt-startup-common-win.cpp

@@ -53 +53 @@
 
 #include "internal/compiler-vcc.h"
-
-
-/*********************************************************************************************************************************
-*   Global Variables                                                                                                             *
-*********************************************************************************************************************************/
-RT_C_DECLS_BEGIN
-DECL_HIDDEN_DATA(char)      g_szrtProcExePath[RTPATH_MAX] = "Unknown.exe";
-DECL_HIDDEN_DATA(size_t)    g_cchrtProcExePath = 11;
-DECL_HIDDEN_DATA(size_t)    g_cchrtProcExeDir = 0;
-DECL_HIDDEN_DATA(size_t)    g_offrtProcName = 0;
-RT_C_DECLS_END
+#include "internal/process.h"