<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[162352] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/162352">162352</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-20 09:10:36 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Convert GCThreadSharedData over to STL threading primitives
https://bugs.webkit.org/show_bug.cgi?id=127256
Reviewed by Andreas Kling.
* heap/GCThread.cpp:
(JSC::GCThread::waitForNextPhase):
(JSC::GCThread::gcThreadMain):
* heap/GCThreadSharedData.cpp:
(JSC::GCThreadSharedData::GCThreadSharedData):
(JSC::GCThreadSharedData::~GCThreadSharedData):
(JSC::GCThreadSharedData::startNextPhase):
(JSC::GCThreadSharedData::endCurrentPhase):
(JSC::GCThreadSharedData::didStartMarking):
(JSC::GCThreadSharedData::didFinishMarking):
* heap/GCThreadSharedData.h:
* heap/SlotVisitor.cpp:
(JSC::SlotVisitor::donateKnownParallel):
(JSC::SlotVisitor::drainFromShared):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapGCThreadcpp">trunk/Source/JavaScriptCore/heap/GCThread.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapGCThreadSharedDatacpp">trunk/Source/JavaScriptCore/heap/GCThreadSharedData.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapGCThreadSharedDatah">trunk/Source/JavaScriptCore/heap/GCThreadSharedData.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapSlotVisitorcpp">trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (162351 => 162352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-20 17:02:50 UTC (rev 162351)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-20 17:10:36 UTC (rev 162352)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-01-19 Anders Carlsson <andersca@apple.com>
+
+ Convert GCThreadSharedData over to STL threading primitives
+ https://bugs.webkit.org/show_bug.cgi?id=127256
+
+ Reviewed by Andreas Kling.
+
+ * heap/GCThread.cpp:
+ (JSC::GCThread::waitForNextPhase):
+ (JSC::GCThread::gcThreadMain):
+ * heap/GCThreadSharedData.cpp:
+ (JSC::GCThreadSharedData::GCThreadSharedData):
+ (JSC::GCThreadSharedData::~GCThreadSharedData):
+ (JSC::GCThreadSharedData::startNextPhase):
+ (JSC::GCThreadSharedData::endCurrentPhase):
+ (JSC::GCThreadSharedData::didStartMarking):
+ (JSC::GCThreadSharedData::didFinishMarking):
+ * heap/GCThreadSharedData.h:
+ * heap/SlotVisitor.cpp:
+ (JSC::SlotVisitor::donateKnownParallel):
+ (JSC::SlotVisitor::drainFromShared):
+
</ins><span class="cx"> 2014-01-18 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> CodeBlock: Size m_callLinkInfos and m_byValInfos to fit earlier.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCThread.cpp (162351 => 162352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCThread.cpp 2014-01-20 17:02:50 UTC (rev 162351)
+++ trunk/Source/JavaScriptCore/heap/GCThread.cpp 2014-01-20 17:10:36 UTC (rev 162352)
</span><span class="lines">@@ -69,16 +69,14 @@
</span><span class="cx">
</span><span class="cx"> GCPhase GCThread::waitForNextPhase()
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_shared.m_phaseLock);
- while (m_shared.m_gcThreadsShouldWait)
- m_shared.m_phaseCondition.wait(m_shared.m_phaseLock);
</del><ins>+ std::unique_lock<std::mutex> lock(m_shared.m_phaseMutex);
+ m_shared.m_phaseConditionVariable.wait(lock, [this] { return !m_shared.m_gcThreadsShouldWait; });
</ins><span class="cx">
</span><span class="cx"> m_shared.m_numberOfActiveGCThreads--;
</span><span class="cx"> if (!m_shared.m_numberOfActiveGCThreads)
</span><del>- m_shared.m_activityCondition.signal();
</del><ins>+ m_shared.m_activityConditionVariable.notify_one();
</ins><span class="cx">
</span><del>- while (m_shared.m_currentPhase == NoPhase)
- m_shared.m_phaseCondition.wait(m_shared.m_phaseLock);
</del><ins>+ m_shared.m_phaseConditionVariable.wait(lock, [this] { return m_shared.m_currentPhase != NoPhase; });
</ins><span class="cx"> m_shared.m_numberOfActiveGCThreads++;
</span><span class="cx"> return m_shared.m_currentPhase;
</span><span class="cx"> }
</span><span class="lines">@@ -92,7 +90,7 @@
</span><span class="cx"> // Wait for the main thread to finish creating and initializing us. The main thread grabs this lock before
</span><span class="cx"> // creating this thread. We aren't guaranteed to have a valid threadID until the main thread releases this lock.
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_shared.m_phaseLock);
</del><ins>+ std::lock_guard<std::mutex> lock(m_shared.m_phaseMutex);
</ins><span class="cx"> }
</span><span class="cx"> {
</span><span class="cx"> ParallelModeEnabler enabler(*m_slotVisitor);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCThreadSharedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCThreadSharedData.cpp (162351 => 162352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCThreadSharedData.cpp 2014-01-20 17:02:50 UTC (rev 162351)
+++ trunk/Source/JavaScriptCore/heap/GCThreadSharedData.cpp 2014-01-20 17:10:36 UTC (rev 162352)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> m_copyLock.Init();
</span><span class="cx"> #if ENABLE(PARALLEL_GC)
</span><span class="cx"> // Grab the lock so the new GC threads can be properly initialized before they start running.
</span><del>- MutexLocker locker(m_phaseLock);
</del><ins>+ std::unique_lock<std::mutex> lock(m_phaseMutex);
</ins><span class="cx"> for (unsigned i = 1; i < Options::numberOfGCMarkers(); ++i) {
</span><span class="cx"> m_numberOfActiveGCThreads++;
</span><span class="cx"> SlotVisitor* slotVisitor = new SlotVisitor(*this);
</span><span class="lines">@@ -95,8 +95,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Wait for all the GCThreads to get to the right place.
</span><del>- while (m_numberOfActiveGCThreads)
- m_activityCondition.wait(m_phaseLock);
</del><ins>+ m_activityConditionVariable.wait(lock, [this] { return !m_numberOfActiveGCThreads; });
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -105,13 +104,13 @@
</span><span class="cx"> #if ENABLE(PARALLEL_GC)
</span><span class="cx"> // Destroy our marking threads.
</span><span class="cx"> {
</span><del>- MutexLocker markingLocker(m_markingLock);
- MutexLocker phaseLocker(m_phaseLock);
</del><ins>+ std::lock_guard<std::mutex> markingLock(m_markingMutex);
+ std::lock_guard<std::mutex> phaseLock(m_phaseMutex);
</ins><span class="cx"> ASSERT(m_currentPhase == NoPhase);
</span><span class="cx"> m_parallelMarkersShouldExit = true;
</span><span class="cx"> m_gcThreadsShouldWait = false;
</span><span class="cx"> m_currentPhase = Exit;
</span><del>- m_phaseCondition.broadcast();
</del><ins>+ m_phaseConditionVariable.notify_all();
</ins><span class="cx"> }
</span><span class="cx"> for (unsigned i = 0; i < m_gcThreads.size(); ++i) {
</span><span class="cx"> waitForThreadCompletion(m_gcThreads[i]->threadID());
</span><span class="lines">@@ -139,28 +138,27 @@
</span><span class="cx">
</span><span class="cx"> void GCThreadSharedData::startNextPhase(GCPhase phase)
</span><span class="cx"> {
</span><del>- MutexLocker phaseLocker(m_phaseLock);
</del><ins>+ std::lock_guard<std::mutex> lock(m_phaseMutex);
</ins><span class="cx"> ASSERT(!m_gcThreadsShouldWait);
</span><span class="cx"> ASSERT(m_currentPhase == NoPhase);
</span><span class="cx"> m_gcThreadsShouldWait = true;
</span><span class="cx"> m_currentPhase = phase;
</span><del>- m_phaseCondition.broadcast();
</del><ins>+ m_phaseConditionVariable.notify_all();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GCThreadSharedData::endCurrentPhase()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_gcThreadsShouldWait);
</span><del>- MutexLocker locker(m_phaseLock);
</del><ins>+ std::unique_lock<std::mutex> lock(m_phaseMutex);
</ins><span class="cx"> m_currentPhase = NoPhase;
</span><span class="cx"> m_gcThreadsShouldWait = false;
</span><del>- m_phaseCondition.broadcast();
- while (m_numberOfActiveGCThreads)
- m_activityCondition.wait(m_phaseLock);
</del><ins>+ m_phaseConditionVariable.notify_all();
+ m_activityConditionVariable.wait(lock, [this] { return !m_numberOfActiveGCThreads; });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GCThreadSharedData::didStartMarking()
</span><span class="cx"> {
</span><del>- MutexLocker markingLocker(m_markingLock);
</del><ins>+ std::lock_guard<std::mutex> lock(m_markingMutex);
</ins><span class="cx"> m_parallelMarkersShouldExit = false;
</span><span class="cx"> startNextPhase(Mark);
</span><span class="cx"> }
</span><span class="lines">@@ -168,9 +166,9 @@
</span><span class="cx"> void GCThreadSharedData::didFinishMarking()
</span><span class="cx"> {
</span><span class="cx"> {
</span><del>- MutexLocker markingLocker(m_markingLock);
</del><ins>+ std::lock_guard<std::mutex> lock(m_markingMutex);
</ins><span class="cx"> m_parallelMarkersShouldExit = true;
</span><del>- m_markingCondition.broadcast();
</del><ins>+ m_markingConditionVariable.notify_all();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(m_currentPhase == Mark);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCThreadSharedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCThreadSharedData.h (162351 => 162352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCThreadSharedData.h 2014-01-20 17:02:50 UTC (rev 162351)
+++ trunk/Source/JavaScriptCore/heap/GCThreadSharedData.h 2014-01-20 17:10:36 UTC (rev 162352)
</span><span class="lines">@@ -31,9 +31,9 @@
</span><span class="cx"> #include "MarkedBlock.h"
</span><span class="cx"> #include "UnconditionalFinalizer.h"
</span><span class="cx"> #include "WeakReferenceHarvester.h"
</span><ins>+#include <condition_variable>
</ins><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/TCSpinLock.h>
</span><del>-#include <wtf/Threading.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -86,8 +86,8 @@
</span><span class="cx">
</span><span class="cx"> Vector<GCThread*> m_gcThreads;
</span><span class="cx">
</span><del>- Mutex m_markingLock;
- ThreadCondition m_markingCondition;
</del><ins>+ std::mutex m_markingMutex;
+ std::condition_variable m_markingConditionVariable;
</ins><span class="cx"> MarkStackArray m_sharedMarkStack;
</span><span class="cx"> unsigned m_numberOfActiveParallelMarkers;
</span><span class="cx"> bool m_parallelMarkersShouldExit;
</span><span class="lines">@@ -100,9 +100,9 @@
</span><span class="cx"> size_t m_copyIndex;
</span><span class="cx"> static const size_t s_blockFragmentLength = 32;
</span><span class="cx">
</span><del>- Mutex m_phaseLock;
- ThreadCondition m_phaseCondition;
- ThreadCondition m_activityCondition;
</del><ins>+ std::mutex m_phaseMutex;
+ std::condition_variable m_phaseConditionVariable;
+ std::condition_variable m_activityConditionVariable;
</ins><span class="cx"> unsigned m_numberOfActiveGCThreads;
</span><span class="cx"> bool m_gcThreadsShouldWait;
</span><span class="cx"> GCPhase m_currentPhase;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapSlotVisitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp (162351 => 162352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp 2014-01-20 17:02:50 UTC (rev 162351)
+++ trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp 2014-01-20 17:10:36 UTC (rev 162352)
</span><span class="lines">@@ -118,15 +118,15 @@
</span><span class="cx">
</span><span class="cx"> // If we're contending on the lock, be conservative and assume that another
</span><span class="cx"> // thread is already donating.
</span><del>- MutexTryLocker locker(m_shared.m_markingLock);
- if (!locker.locked())
</del><ins>+ std::unique_lock<std::mutex> lock(m_shared.m_markingMutex, std::try_to_lock);
+ if (!lock.owns_lock())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Otherwise, assume that a thread will go idle soon, and donate.
</span><span class="cx"> m_stack.donateSomeCellsTo(m_shared.m_sharedMarkStack);
</span><span class="cx">
</span><span class="cx"> if (m_shared.m_numberOfActiveParallelMarkers < Options::numberOfGCMarkers())
</span><del>- m_shared.m_markingCondition.broadcast();
</del><ins>+ m_shared.m_markingConditionVariable.notify_all();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SlotVisitor::drain()
</span><span class="lines">@@ -181,12 +181,12 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PARALLEL_GC)
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_shared.m_markingLock);
</del><ins>+ std::lock_guard<std::mutex> lock(m_shared.m_markingMutex);
</ins><span class="cx"> m_shared.m_numberOfActiveParallelMarkers++;
</span><span class="cx"> }
</span><span class="cx"> while (true) {
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_shared.m_markingLock);
</del><ins>+ std::unique_lock<std::mutex> lock(m_shared.m_markingMutex);
</ins><span class="cx"> m_shared.m_numberOfActiveParallelMarkers--;
</span><span class="cx">
</span><span class="cx"> // How we wait differs depending on drain mode.
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> // Did we reach termination?
</span><span class="cx"> if (!m_shared.m_numberOfActiveParallelMarkers && m_shared.m_sharedMarkStack.isEmpty()) {
</span><span class="cx"> // Let any sleeping slaves know it's time for them to return;
</span><del>- m_shared.m_markingCondition.broadcast();
</del><ins>+ m_shared.m_markingConditionVariable.notify_all();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -206,18 +206,17 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> // Otherwise wait.
</span><del>- m_shared.m_markingCondition.wait(m_shared.m_markingLock);
</del><ins>+ m_shared.m_markingConditionVariable.wait(lock);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> ASSERT(sharedDrainMode == SlaveDrain);
</span><span class="cx">
</span><span class="cx"> // Did we detect termination? If so, let the master know.
</span><span class="cx"> if (!m_shared.m_numberOfActiveParallelMarkers && m_shared.m_sharedMarkStack.isEmpty())
</span><del>- m_shared.m_markingCondition.broadcast();
</del><ins>+ m_shared.m_markingConditionVariable.notify_all();
+
+ m_shared.m_markingConditionVariable.wait(lock, [this] { return !m_shared.m_sharedMarkStack.isEmpty() || m_shared.m_parallelMarkersShouldExit; });
</ins><span class="cx">
</span><del>- while (m_shared.m_sharedMarkStack.isEmpty() && !m_shared.m_parallelMarkersShouldExit)
- m_shared.m_markingCondition.wait(m_shared.m_markingLock);
-
</del><span class="cx"> // Is the current phase done? If so, return from this function.
</span><span class="cx"> if (m_shared.m_parallelMarkersShouldExit)
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>