d: Import dmd b8384668f, druntime e6caaab9, phobos 5ab9ad256 (v2.098.0-beta.1)

[thirdparty/gcc.git] / libphobos / libdruntime / core / internal / spinlock.d

diff --git a/libphobos/libdruntime/core/internal/spinlock.d b/libphobos/libdruntime/core/internal/spinlock.d
index fb689dc561fc163335ee094f4810b922fa853e98..36d806ad014a0d5d07bc1bfba413c7908f8d6d1e 100644 (file)
--- a/libphobos/libdruntime/core/internal/spinlock.d
+++ b/libphobos/libdruntime/core/internal/spinlock.d
@@ -2,7 +2,7 @@
  * SpinLock for runtime internal usage.
  *
  * Copyright: Copyright Digital Mars 2015 -.
- * License:   $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
+ * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
  * Authors:   Martin Nowak
  * Source: $(DRUNTIMESRC core/internal/_spinlock.d)
  */
@@ -50,8 +50,9 @@ shared struct SpinLock
     /// yield with backoff
     void yield(size_t k)
     {
+        import core.time;
         if (k < pauseThresh)
-            return pause();
+            return core.atomic.pause();
         else if (k < 32)
             return Thread.yield();
         Thread.sleep(1.msecs);
@@ -66,25 +67,9 @@ private:
         enum X86 = false;
 
     static if (X86)
-    {
         enum pauseThresh = 16;
-        void pause()
-        {
-            asm @trusted @nogc nothrow
-            {
-                // pause instruction
-                rep;
-                nop;
-            }
-        }
-    }
     else
-    {
         enum pauseThresh = 4;
-        void pause()
-        {
-        }
-    }
 
     size_t val;
     Contention contention;
@@ -93,7 +78,7 @@ private:
 // aligned to cacheline to avoid false sharing
 shared align(64) struct AlignedSpinLock
 {
-    this(SpinLock.Contention contention)
+    this(SpinLock.Contention contention) @trusted @nogc nothrow
     {
         impl = shared(SpinLock)(contention);
     }