Changeset 181545 in webkit

Timestamp:

Mar 16, 2015, 4:47:11 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r181469 - Change the DFG crashLock to use std::atomic.
<​https://webkit.org/b/142649>

Reviewed by Filip Pizlo.

• dfg/DFGCommon.cpp:

(JSC::DFG::startCrashing):
(JSC::DFG::isCrashing):

Location:

releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGCommon.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-03-12  Mark Lam  <mark.lam@apple.com>
+
+        Change the DFG crashLock to use std::atomic.
+        <https://webkit.org/b/142649>
+
+        Reviewed by Filip Pizlo.
+
+        * dfg/DFGCommon.cpp:
+        (JSC::DFG::startCrashing):
+        (JSC::DFG::isCrashing):
+
 2015-03-12  Mark Lam  <mark.lam@apple.com>
 

releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/dfg/DFGCommon.cpp

@@ -34 +34 @@
 namespace JSC { namespace DFG {
 
-static unsigned crashLock;
+static std::atomic<unsigned> crashLock;
 
 void startCrashing()
 {
-#if ENABLE(COMPARE_AND_SWAP)
-    while (!WTF::weakCompareAndSwap(&crashLock, 0, 1))
+    unsigned expected = 0;
+    while (!crashLock.compare_exchange_weak(expected, 1, std::memory_order_acquire)) {
         std::this_thread::yield();
-#else
-    crashLock = 1;
-#endif
+        expected = 0;
+    }
 }
 
 bool isCrashing()
 {
-    return !!crashLock;
+    return !!crashLock.load(std::memory_order_acquire);
 }