<!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>[161161] 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/161161">161161</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-30 17:22:01 -0800 (Mon, 30 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using ThreadCondition in BlockAllocator
https://bugs.webkit.org/show_bug.cgi?id=126313
Reviewed by Sam Weinig.
* heap/BlockAllocator.cpp:
(JSC::BlockAllocator::~BlockAllocator):
(JSC::BlockAllocator::waitForDuration):
(JSC::BlockAllocator::blockFreeingThreadMain):
* heap/BlockAllocator.h:
(JSC::BlockAllocator::deallocate):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapBlockAllocatorcpp">trunk/Source/JavaScriptCore/heap/BlockAllocator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapBlockAllocatorh">trunk/Source/JavaScriptCore/heap/BlockAllocator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (161160 => 161161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-31 00:31:11 UTC (rev 161160)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-31 01:22:01 UTC (rev 161161)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2013-12-30 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Stop using ThreadCondition in BlockAllocator
+ https://bugs.webkit.org/show_bug.cgi?id=126313
+
+ Reviewed by Sam Weinig.
+
+ * heap/BlockAllocator.cpp:
+ (JSC::BlockAllocator::~BlockAllocator):
+ (JSC::BlockAllocator::waitForDuration):
+ (JSC::BlockAllocator::blockFreeingThreadMain):
+ * heap/BlockAllocator.h:
+ (JSC::BlockAllocator::deallocate):
+
+2013-12-30 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Stop using ThreadCondition in jsc.cpp
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126311
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapBlockAllocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/BlockAllocator.cpp (161160 => 161161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/BlockAllocator.cpp 2013-12-31 00:31:11 UTC (rev 161160)
+++ trunk/Source/JavaScriptCore/heap/BlockAllocator.cpp 2013-12-31 01:22:01 UTC (rev 161161)
</span><span class="lines">@@ -61,9 +61,9 @@
</span><span class="cx"> {
</span><span class="cx"> releaseFreeRegions();
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_emptyRegionConditionLock);
</del><ins>+ std::lock_guard<std::mutex> lock(m_emptyRegionConditionMutex);
</ins><span class="cx"> m_blockFreeingThreadShouldQuit = true;
</span><del>- m_emptyRegionCondition.broadcast();
</del><ins>+ m_emptyRegionCondition.notify_all();
</ins><span class="cx"> }
</span><span class="cx"> if (m_blockFreeingThread)
</span><span class="cx"> waitForThreadCompletion(m_blockFreeingThread);
</span><span class="lines">@@ -101,22 +101,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BlockAllocator::waitForRelativeTimeWhileHoldingLock(double relative)
</del><ins>+void BlockAllocator::waitForDuration(std::chrono::milliseconds duration)
</ins><span class="cx"> {
</span><del>- if (m_blockFreeingThreadShouldQuit)
- return;
</del><ins>+ std::unique_lock<std::mutex> lock(m_emptyRegionConditionMutex);
</ins><span class="cx">
</span><del>- m_emptyRegionCondition.timedWait(m_emptyRegionConditionLock, currentTime() + relative);
-}
-
-void BlockAllocator::waitForRelativeTime(double relative)
-{
</del><span class="cx"> // If this returns early, that's fine, so long as it doesn't do it too
</span><span class="cx"> // frequently. It would only be a bug if this function failed to return
</span><span class="cx"> // when it was asked to do so.
</span><del>-
- MutexLocker locker(m_emptyRegionConditionLock);
- waitForRelativeTimeWhileHoldingLock(relative);
</del><ins>+ if (m_blockFreeingThreadShouldQuit)
+ return;
+
+ m_emptyRegionCondition.wait_for(lock, duration);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlockAllocator::blockFreeingThreadStartFunc(void* blockAllocator)
</span><span class="lines">@@ -130,7 +125,7 @@
</span><span class="cx"> while (!m_blockFreeingThreadShouldQuit) {
</span><span class="cx"> // Generally wait for one second before scavenging free blocks. This
</span><span class="cx"> // may return early, particularly when we're being asked to quit.
</span><del>- waitForRelativeTime(1.0);
</del><ins>+ waitForDuration(std::chrono::seconds(1));
</ins><span class="cx"> if (m_blockFreeingThreadShouldQuit)
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -141,11 +136,11 @@
</span><span class="cx">
</span><span class="cx"> // Sleep until there is actually work to do rather than waking up every second to check.
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_emptyRegionConditionLock);
</del><ins>+ std::unique_lock<std::mutex> lock(m_emptyRegionConditionMutex);
</ins><span class="cx"> SpinLockHolder regionLocker(&m_regionLock);
</span><span class="cx"> while (!m_numberOfEmptyRegions && !m_blockFreeingThreadShouldQuit) {
</span><span class="cx"> m_regionLock.Unlock();
</span><del>- m_emptyRegionCondition.wait(m_emptyRegionConditionLock);
</del><ins>+ m_emptyRegionCondition.wait(lock);
</ins><span class="cx"> m_regionLock.Lock();
</span><span class="cx"> }
</span><span class="cx"> currentNumberOfEmptyRegions = m_numberOfEmptyRegions;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapBlockAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/BlockAllocator.h (161160 => 161161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/BlockAllocator.h 2013-12-31 00:31:11 UTC (rev 161160)
+++ trunk/Source/JavaScriptCore/heap/BlockAllocator.h 2013-12-31 01:22:01 UTC (rev 161161)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "GCActivityCallback.h"
</span><span class="cx"> #include "HeapBlock.h"
</span><span class="cx"> #include "Region.h"
</span><ins>+#include <mutex>
</ins><span class="cx"> #include <wtf/DoublyLinkedList.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/PageAllocationAligned.h>
</span><span class="lines">@@ -60,8 +61,7 @@
</span><span class="cx"> template <typename T> void deallocateCustomSize(T*);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void waitForRelativeTimeWhileHoldingLock(double relative);
- void waitForRelativeTime(double relative);
</del><ins>+ void waitForDuration(std::chrono::milliseconds);
</ins><span class="cx">
</span><span class="cx"> friend ThreadIdentifier createBlockFreeingThread(BlockAllocator*);
</span><span class="cx"> void blockFreeingThreadMain();
</span><span class="lines">@@ -105,8 +105,8 @@
</span><span class="cx"> bool m_isCurrentlyAllocating;
</span><span class="cx"> bool m_blockFreeingThreadShouldQuit;
</span><span class="cx"> SpinLock m_regionLock;
</span><del>- Mutex m_emptyRegionConditionLock;
- ThreadCondition m_emptyRegionCondition;
</del><ins>+ std::mutex m_emptyRegionConditionMutex;
+ std::condition_variable m_emptyRegionCondition;
</ins><span class="cx"> ThreadIdentifier m_blockFreeingThread;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -199,8 +199,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (shouldWakeBlockFreeingThread) {
</span><del>- MutexLocker mutexLocker(m_emptyRegionConditionLock);
- m_emptyRegionCondition.signal();
</del><ins>+ std::lock_guard<std::mutex> lock(m_emptyRegionConditionMutex);
+ m_emptyRegionCondition.notify_one();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_blockFreeingThread)
</span></span></pre>
</div>
</div>
</body>
</html>