Changeset 33269 in vbox for trunk/src/VBox/Runtime/generic

Timestamp:

Oct 20, 2010 3:42:28 PM (14 years ago)

Author:

vboxsync

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

66829

Message:

IPRT: A quick replacement of the RTMemPage* and RTMemExec* APIs on posix. (Turned out to be a bit more work than expected because of the electric fence heap and init dependencies.)

File:

• trunk/src/VBox/Runtime/generic/critsect-generic.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/generic/critsect-generic.cpp

@@ -52 +52 @@
                              const char *pszNameFmt, ...)
 {
-    AssertReturn(fFlags <= (RTCRITSECT_FLAGS_NO_NESTING | RTCRITSECT_FLAGS_NO_LOCK_VAL), VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & ~(RTCRITSECT_FLAGS_NO_NESTING | RTCRITSECT_FLAGS_NO_LOCK_VAL | RTCRITSECT_FLAGS_BOOTSTRAP_HACK)),
+                 VERR_INVALID_PARAMETER);
 
     /*
@@ -65 +66 @@
     int rc = VINF_SUCCESS;
 #ifdef RTCRITSECT_STRICT
-    if (!pszNameFmt)
-    {
-        static uint32_t volatile s_iCritSectAnon = 0;
-        rc = RTLockValidatorRecExclCreate(&pCritSect->pValidatorRec, hClass, uSubClass, pCritSect,
-                                          !(fFlags & RTCRITSECT_FLAGS_NO_LOCK_VAL),
-                                          "RTCritSect-%u", ASMAtomicIncU32(&s_iCritSectAnon) - 1);
-    }
-    else
-    {
-        va_list va;
-        va_start(va, pszNameFmt);
-        rc = RTLockValidatorRecExclCreateV(&pCritSect->pValidatorRec, hClass, uSubClass, pCritSect,
-                                           !(fFlags & RTCRITSECT_FLAGS_NO_LOCK_VAL), pszNameFmt, va);
-        va_end(va);
+    if (!(fFlags & RTCRITSECT_FLAGS_BOOTSTRAP_HACK))
+    {
+        if (!pszNameFmt)
+        {
+            static uint32_t volatile s_iCritSectAnon = 0;
+            rc = RTLockValidatorRecExclCreate(&pCritSect->pValidatorRec, hClass, uSubClass, pCritSect,
+                                              !(fFlags & RTCRITSECT_FLAGS_NO_LOCK_VAL),
+                                              "RTCritSect-%u", ASMAtomicIncU32(&s_iCritSectAnon) - 1);
+        }
+        else
+        {
+            va_list va;
+            va_start(va, pszNameFmt);
+            rc = RTLockValidatorRecExclCreateV(&pCritSect->pValidatorRec, hClass, uSubClass, pCritSect,
+                                               !(fFlags & RTCRITSECT_FLAGS_NO_LOCK_VAL), pszNameFmt, va);
+            va_end(va);
+        }
     }
 #endif
     if (RT_SUCCESS(rc))
     {
-        rc = RTSemEventCreate(&pCritSect->EventSem);
+        rc = RTSemEventCreateEx(&pCritSect->EventSem,
+                                fFlags & RTCRITSECT_FLAGS_BOOTSTRAP_HACK
+                                ? RTSEMEVENT_FLAGS_NO_LOCK_VAL | RTSEMEVENT_FLAGS_BOOTSTRAP_HACK
+                                : RTSEMEVENT_FLAGS_NO_LOCK_VAL,
+                                NIL_RTLOCKVALCLASS,
+                                NULL);
         if (RT_SUCCESS(rc))
             return VINF_SUCCESS;
@@ -187 +196 @@
 
 #ifdef RTCRITSECT_STRICT
-    RTTHREAD        hThreadSelf = RTThreadSelfAutoAdopt();
-    int rc9 = RTLockValidatorRecExclCheckOrder(pCritSect->pValidatorRec, hThreadSelf, pSrcPos, RT_INDEFINITE_WAIT);
-    if (RT_FAILURE(rc9))
-        return rc9;
+    RTTHREAD hThreadSelf = pCritSect->pValidatorRec
+                         ? RTThreadSelfAutoAdopt()
+                         : RTThreadSelf();
+    int      rc9;
+    if (pCritSect->pValidatorRec) /* (bootstap) */
+    {
+         rc9 = RTLockValidatorRecExclCheckOrder(pCritSect->pValidatorRec, hThreadSelf, pSrcPos, RT_INDEFINITE_WAIT);
+         if (RT_FAILURE(rc9))
+             return rc9;
+    }
 #endif