Fix mmap MT bug on Windows

jart · Nov 1, 2024 · 913b573 · 913b573
1 parent 9add248
commit 913b573
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/libc/intrin/maps.h b/libc/intrin/maps.h
@@ -32,7 +32,7 @@ struct Maps {
   _Atomic(uintptr_t) freed;
   size_t count;
   size_t pages;
-  _Atomic(char *) pick;
+  char *pick;
   struct Map stack;
   struct Map guard;
 };
@@ -49,7 +49,6 @@ bool __maps_lock(void);
 void __maps_check(void);
 void __maps_unlock(void);
 void *__maps_randaddr(void);
-void *__maps_pickaddr(size_t);
 void __maps_add(struct Map *);
 void __maps_free(struct Map *);
 void __maps_insert(struct Map *);

diff --git a/libc/intrin/mmap.c b/libc/intrin/mmap.c
@@ -411,22 +411,21 @@ void *__maps_randaddr(void) {
   return (void *)addr;
 }
 
-void *__maps_pickaddr(size_t size) {
+static void *__maps_pickaddr(size_t size) {
   char *addr;
+  __maps_lock();
   for (int try = 0; try < MAX_TRIES; ++try) {
-    addr = atomic_exchange_explicit(&__maps.pick, 0, memory_order_acq_rel);
+    addr = __maps.pick;
+    __maps.pick = 0;
     if (!addr)
       addr = __maps_randaddr();
-    __maps_lock();
-    bool overlaps = __maps_overlaps(addr, size, __pagesize);
-    __maps_unlock();
-    if (!overlaps) {
-      atomic_store_explicit(&__maps.pick,
-                            addr + ((size + __gransize - 1) & __gransize),
-                            memory_order_release);
+    if (!__maps_overlaps(addr, size, __pagesize)) {
+      __maps.pick = addr + ((size + __gransize - 1) & __gransize);
+      __maps_unlock();
       return addr;
     }
   }
+  __maps_unlock();
   return 0;
 }