zig

commit 25d7f5b65475d087ee1f046a364f8a9e6cd60135 (tree)
parent aaae2f5705a2dee3a12ea49c1094c217a73bb897
Author: emekoi <emekankurumeh@outlook.com>
Date:   Sun, 18 Nov 2018 18:32:50 -0600

switching back to EnterCriticalSection

Diffstat:
M
std/mutex.zig
 | 
13
+++++--------
M
std/os/windows/kernel32.zig
 | 
2
+-

2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/std/mutex.zig b/std/mutex.zig
@@ -77,12 +77,6 @@ const MutexWindows = struct {
         }
     };
 
-    fn initOsData(self: *MutexWindows) void {
-        if (self.lock == null) {
-            windows.InitializeCriticalSection(&self.lock);
-        }
-    }
-
     pub fn init() Mutex {
         return Mutex {
             .lock = null,
@@ -95,8 +89,11 @@ const MutexWindows = struct {
     }
 
     pub fn acquire(self: *Mutex) Held {
-        self.initOsData();
-        while (windows.TryEnterCriticalSection(&self.lock) == 0) {}
+        if (self.lock == null) {
+            windows.InitializeCriticalSection(&self.lock);
+        }
+
+        windows.EnterCriticalSection(&self.lock);
         return Held { .mutex = self };
     }
 };
diff --git a/std/os/windows/kernel32.zig b/std/os/windows/kernel32.zig
@@ -222,7 +222,7 @@ pub const FOREGROUND_RED = 4;
 pub const FOREGROUND_INTENSITY = 8;
 
 pub extern "kernel32" stdcallcc fn InitializeCriticalSection(lpCriticalSection: *?RTL_CRITICAL_SECTION) void;
-pub extern "kernel32" stdcallcc fn TryEnterCriticalSection(lpCriticalSection: *?RTL_CRITICAL_SECTION) BOOL; 
+pub extern "kernel32" stdcallcc fn EnterCriticalSection(lpCriticalSection: *?RTL_CRITICAL_SECTION) void; 
 pub extern "kernel32" stdcallcc fn LeaveCriticalSection(lpCriticalSection: *?RTL_CRITICAL_SECTION) void; 
 pub extern "kernel32" stdcallcc fn DeleteCriticalSection(lpCriticalSection: *?RTL_CRITICAL_SECTION) void;