Rework synchronization primitives - Futex edition

CMakeLists.txt

@@ -492,6 +492,21 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/umodti3.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/start.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/std.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/sync.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/sync/atomic.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/sync/futex.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/sync/primitives.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/sync/futex/event.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/sync/futex/generic.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/sync/futex/os.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/sync/futex/spin.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/sync/primitives/Condvar.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/sync/primitives/Mutex.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/sync/primitives/Once.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/sync/primitives/ResetEvent.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/sync/primitives/RwLock.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/sync/primitives/Semaphore.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/sync/primitives/WaitGroup.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/target.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/target/aarch64.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/target/amdgpu.zig"
@@ -509,10 +524,6 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/lib/std/target/wasm.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/target/x86.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/Thread.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/Thread/AutoResetEvent.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/Thread/Mutex.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/Thread/ResetEvent.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/Thread/StaticResetEvent.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/time.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/unicode.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/zig.zig"
@@ -532,7 +543,6 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/src/RangeSet.zig"
     "${CMAKE_SOURCE_DIR}/src/ThreadPool.zig"
     "${CMAKE_SOURCE_DIR}/src/TypedValue.zig"
-    "${CMAKE_SOURCE_DIR}/src/WaitGroup.zig"
     "${CMAKE_SOURCE_DIR}/src/astgen.zig"
     "${CMAKE_SOURCE_DIR}/src/clang.zig"
     "${CMAKE_SOURCE_DIR}/src/clang_options.zig"

lib/std/Thread.zig

@@ -10,12 +10,7 @@
 
 data: Data,
 
-pub const AutoResetEvent = @import("Thread/AutoResetEvent.zig");
-pub const ResetEvent = @import("Thread/ResetEvent.zig");
-pub const StaticResetEvent = @import("Thread/StaticResetEvent.zig");
-pub const Mutex = @import("Thread/Mutex.zig");
-pub const Semaphore = @import("Thread/Semaphore.zig");
-pub const Condition = @import("Thread/Condition.zig");
+pub usingnamespace std.sync.primitives.with(std.sync.futex.os);
 
 pub const use_pthreads = std.Target.current.os.tag != .windows and builtin.link_libc;
 
@@ -70,8 +65,16 @@ else switch (std.Target.current.os.tag) {
 /// Signals the processor that it is inside a busy-wait spin-loop ("spin lock").
 pub fn spinLoopHint() void {
     switch (std.Target.current.cpu.arch) {
-        .i386, .x86_64 => asm volatile ("pause" ::: "memory"),
-        .arm, .aarch64 => asm volatile ("yield" ::: "memory"),
+        .i386, .x86_64 => asm volatile ("pause"
+            :
+            :
+            : "memory"
+        ),
+        .arm, .aarch64 => asm volatile ("yield"
+            :
+            :
+            : "memory"
+        ),
         else => {},
     }
 }
@@ -82,11 +85,12 @@ pub fn spinLoopHint() void {
 pub fn getCurrentId() Id {
     if (use_pthreads) {
         return c.pthread_self();
-    } else return switch (std.Target.current.os.tag) {
-        .linux => os.linux.gettid(),
-        .windows => windows.kernel32.GetCurrentThreadId(),
-        else => @compileError("Unsupported OS"),
-    };
+    } else
+        return switch (std.Target.current.os.tag) {
+            .linux => os.linux.gettid(),
+            .windows => windows.kernel32.GetCurrentThreadId(),
+            else => @compileError("Unsupported OS"),
+        };
 }
 
 /// Returns the handle of this thread.