Changeset 33269 in vbox for trunk/src/VBox/Runtime/r3/win

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.)

Location:

trunk/src/VBox/Runtime/r3/win

Files:

• alloc-win.cpp (modified) (1 diff)
• semevent-win.cpp (modified) (7 diffs)

trunk/src/VBox/Runtime/r3/win/alloc-win.cpp

@@ -76 +76 @@
 
 
-RTDECL(void)    RTMemExecFree(void *pv) RT_NO_THROW
+RTDECL(void)    RTMemExecFree(void *pv, size_t cb) RT_NO_THROW
 {
     if (pv)

trunk/src/VBox/Runtime/r3/win/semevent-win.cpp

@@ -42 +42 @@
 #include <iprt/thread.h>
 #include "internal/magics.h"
+#include "internal/mem.h"
 #include "internal/strict.h"
 
@@ -60 +61 @@
     bool volatile       fEverHadSignallers;
 #endif
+    /** The creation flags. */
+    uint32_t            fFlags;
 };
 
@@ -72 +75 @@
 RTDECL(int)  RTSemEventCreateEx(PRTSEMEVENT phEventSem, uint32_t fFlags, RTLOCKVALCLASS hClass, const char *pszNameFmt, ...)
 {
-    AssertReturn(!(fFlags & ~RTSEMEVENT_FLAGS_NO_LOCK_VAL), VERR_INVALID_PARAMETER);
-
-    struct RTSEMEVENTINTERNAL *pThis = (struct RTSEMEVENTINTERNAL *)RTMemAlloc(sizeof(*pThis));
+    AssertReturn(!(fFlags & ~(RTSEMEVENT_FLAGS_NO_LOCK_VAL | RTSEMEVENT_FLAGS_BOOTSTRAP_HACK)), VERR_INVALID_PARAMETER);
+    Assert(!(fFlags & RTSEMEVENT_FLAGS_BOOTSTRAP_HACK) || (fFlags & RTSEMEVENT_FLAGS_NO_LOCK_VAL));
+
+    struct RTSEMEVENTINTERNAL *pThis;
+    if (!(fFlags & RTSEMEVENT_FLAGS_BOOTSTRAP_HACK))
+        pThis = (struct RTSEMEVENTINTERNAL *)RTMemAlloc(sizeof(*pThis));
+    else
+        pThis = (struct RTSEMEVENTINTERNAL *)rtMemBaseAlloc(sizeof(*pThis));
     if (!pThis)
         return VERR_NO_MEMORY;
@@ -86 +94 @@
     {
         pThis->u32Magic = RTSEMEVENT_MAGIC;
+        pThis->fFlags   = fFlags;
 #ifdef RTSEMEVENT_STRICT
         if (!pszNameFmt)
@@ -111 +120 @@
 
     DWORD dwErr = GetLastError();
-    RTMemFree(pThis);
+    if (!(fFlags & RTSEMEVENT_FLAGS_BOOTSTRAP_HACK))
+        RTMemFree(pThis);
+    else
+        rtMemBaseFree(pThis);
     return RTErrConvertFromWin32(dwErr);
 }
@@ -134 +146 @@
         RTLockValidatorRecSharedDelete(&pThis->Signallers);
 #endif
-        RTMemFree(pThis);
+        if (!(pThis->fFlags & RTSEMEVENT_FLAGS_BOOTSTRAP_HACK))
+            RTMemFree(pThis);
+        else
+            rtMemBaseFree(pThis);
     }
     else
@@ -218 +233 @@
      */
 #ifdef RTSEMEVENT_STRICT
-    RTTHREAD hThreadSelf = RTThreadSelfAutoAdopt();
+    RTTHREAD hThreadSelf = !(pThis->fFlags & RTSEMEVENT_FLAGS_BOOTSTRAP_HACK)
+                         ? RTThreadSelfAutoAdopt()
+                         : RTThreadSelf();
     if (pThis->fEverHadSignallers)
     {