"WASI is single-threaded" version branch substituted by isSingleThreaded check

Author: denizzzka

druntime/src/core/sync/barrier.d

@@ -19,6 +19,7 @@ module core.sync.barrier;
 public import core.sync.exception;
 import core.sync.condition;
 import core.sync.mutex;
+import core.thread : isSingleThreaded;
 
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -106,8 +107,7 @@ private:
 // Unit Tests
 ////////////////////////////////////////////////////////////////////////////////
 
-version (WASI) {} // WASI is single-threaded
-else
+static if(!isSingleThreaded)
 unittest
 {
     import core.thread;

druntime/src/core/sync/condition.d

@@ -21,6 +21,7 @@ public import core.sync.mutex;
 public import core.time;
 
 import core.exception : AssertError, staticError;
+import core.thread : isSingleThreaded;
 
 
 version (Windows)
@@ -623,8 +624,7 @@ private:
 // Unit Tests
 ////////////////////////////////////////////////////////////////////////////////
 
-version (WASI) {} // WASI is single-threaded
-else
+static if(!isSingleThreaded)
 unittest
 {
     import core.atomic : atomicLoad;
@@ -792,8 +792,7 @@ unittest
     testWaitTimeout();
 }
 
-version (WASI) {} // WASI is single-threaded
-else
+static if(!isSingleThreaded)
 unittest
 {
     import core.atomic : atomicLoad;

druntime/src/core/sync/event.d

@@ -33,6 +33,7 @@ else
 
 import core.internal.abort : abort;
 import core.time;
+import core.thread : isSingleThreaded;
 
 /**
  * represents an event. Clients of an event are suspended while waiting
@@ -333,8 +334,7 @@ private:
     assert(!ev2.wait(1.dur!"msecs"));
 }
 
-version (WASI) {} // WASI is single-threaded
-else
+static if(!isSingleThreaded)
 unittest
 {
     import core.atomic;

druntime/src/core/sync/mutex.d

@@ -17,6 +17,7 @@ module core.sync.mutex;
 
 
 public import core.sync.exception;
+import core.thread : isSingleThreaded;
 
 version (Windows)
 {
@@ -309,8 +310,7 @@ package:
 ///
 /* @safe nothrow -> see druntime PR 1726 */
 // Test regular usage.
-version (WASI) {} // WASI is single-threaded
-else
+static if(!isSingleThreaded)
 unittest
 {
     import core.thread : Thread;
@@ -417,8 +417,7 @@ unittest
     m.unlock();
 }
 
-version (WASI) {} // WASI is single-threaded
-else
+static if(!isSingleThreaded)
 unittest
 {
     import core.thread;

druntime/src/core/sync/rwmutex.d

@@ -19,6 +19,7 @@ module core.sync.rwmutex;
 public import core.sync.exception;
 import core.sync.condition;
 import core.sync.mutex;
+import core.thread : isSingleThreaded;
 import core.memory;
 import core.atomic : atomicLoad;
 
@@ -562,8 +563,7 @@ private:
 // Unit Tests
 ////////////////////////////////////////////////////////////////////////////////
 
-version (WASI) {} // WASI is single-threaded
-else
+static if(!isSingleThreaded)
 unittest
 {
     import core.atomic, core.thread, core.sync.semaphore;
@@ -703,8 +703,7 @@ unittest
     runTest(ReadWriteMutex.Policy.PREFER_WRITERS);
 }
 
-version (WASI) {} // WASI is single-threaded
-else
+static if(!isSingleThreaded)
 unittest
 {
     import core.atomic, core.thread;
@@ -781,8 +780,7 @@ unittest
     }
 }
 
-version (WASI) {} // WASI is single-threaded
-else
+static if(!isSingleThreaded)
 unittest
 {
     import core.atomic, core.thread, core.sync.semaphore;
@@ -924,8 +922,7 @@ unittest
     runTest(ReadWriteMutex.Policy.PREFER_WRITERS);
 }
 
-version (WASI) {} // WASI is single-threaded
-else
+static if(!isSingleThreaded)
 unittest
 {
     import core.atomic, core.thread;

druntime/src/core/sync/semaphore.d

@@ -17,6 +17,7 @@ module core.sync.semaphore;
 
 public import core.sync.exception;
 public import core.time;
+import core.thread : isSingleThreaded;
 
 version (OSX)
     version = Darwin;
@@ -398,8 +399,7 @@ protected:
 // Unit Tests
 ////////////////////////////////////////////////////////////////////////////////
 
-version (WASI) {} // WASI is single-threaded
-else
+static if(!isSingleThreaded)
 unittest
 {
     import core.atomic;

druntime/src/core/thread/package.d

@@ -22,8 +22,7 @@ public import core.thread.context;
 
 // this test is here to avoid a cyclic dependency between
 // core.thread and core.atomic
-version (WASI) {} // WASI is single-threaded
-else
+static if(!isSingleThreaded)
 @system unittest
 {
     import core.atomic;

druntime/src/core/thread/posix_impl.d

@@ -156,7 +156,10 @@ else
     }
 }
 
-package enum isSingleThreaded = false;
+version (WASI)
+    package(core) enum isSingleThreaded = true;
+else
+    package(core) enum isSingleThreaded = false;
 
 version (CoreDdoc) {} else
 class Thread : ThreadBase

druntime/src/core/thread/windows_impl.d

@@ -52,7 +52,7 @@ package void* swapContextImpl()(void* newContext) nothrow @nogc
     return _d_eh_swapContext(newContext);
 }
 
-package enum isSingleThreaded = false;
+package(core) enum isSingleThreaded = false;
 
 version (CoreDdoc) {} else
 class Thread : ThreadBase