Title: [181545] releases/WebKitGTK/webkit-2.8/Source/_javascript_Core
- Revision
- 181545
- Author
- [email protected]
- Date
- 2015-03-16 04:47:11 -0700 (Mon, 16 Mar 2015)
Log 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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog (181544 => 181545)
--- releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog 2015-03-16 11:45:11 UTC (rev 181544)
+++ releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog 2015-03-16 11:47:11 UTC (rev 181545)
@@ -1,5 +1,16 @@
2015-03-12 Mark Lam <[email protected]>
+ 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 <[email protected]>
+
Use std::atomic for CodeBlock::m_visitAggregateHasBeenCalled.
<https://webkit.org/b/142640>
Modified: releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/dfg/DFGCommon.cpp (181544 => 181545)
--- releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/dfg/DFGCommon.cpp 2015-03-16 11:45:11 UTC (rev 181544)
+++ releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/dfg/DFGCommon.cpp 2015-03-16 11:47:11 UTC (rev 181545)
@@ -33,21 +33,20 @@
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);
}
} } // namespace JSC::DFG
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
