<!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>[179407] 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/179407">179407</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-01-30 11:57:35 -0800 (Fri, 30 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use FastMalloc (bmalloc) instead of BlockAllocator for GC pages
https://bugs.webkit.org/show_bug.cgi?id=140900
Reviewed by NOBODY (OOPS!).
Re-landing just the CopyWorkListSegment piece of this patch.
* heap/CopiedBlockInlines.h:
(JSC::CopiedBlock::reportLiveBytes):
* heap/CopyWorkList.h:
(JSC::CopyWorkListSegment::create):
(JSC::CopyWorkListSegment::destroy):
(JSC::CopyWorkListSegment::CopyWorkListSegment):
(JSC::CopyWorkList::CopyWorkList):
(JSC::CopyWorkList::~CopyWorkList):
(JSC::CopyWorkList::append):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCopiedBlockInlinesh">trunk/Source/JavaScriptCore/heap/CopiedBlockInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCopyWorkListh">trunk/Source/JavaScriptCore/heap/CopyWorkList.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (179406 => 179407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-30 19:09:14 UTC (rev 179406)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-30 19:57:35 UTC (rev 179407)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-01-30 Geoffrey Garen <ggaren@apple.com>
+
+ Use FastMalloc (bmalloc) instead of BlockAllocator for GC pages
+ https://bugs.webkit.org/show_bug.cgi?id=140900
+
+ Reviewed by Mark Hahnenberg.
+
+ Re-landing just the CopyWorkListSegment piece of this patch.
+
+ * heap/CopiedBlockInlines.h:
+ (JSC::CopiedBlock::reportLiveBytes):
+ * heap/CopyWorkList.h:
+ (JSC::CopyWorkListSegment::create):
+ (JSC::CopyWorkListSegment::destroy):
+ (JSC::CopyWorkListSegment::CopyWorkListSegment):
+ (JSC::CopyWorkList::CopyWorkList):
+ (JSC::CopyWorkList::~CopyWorkList):
+ (JSC::CopyWorkList::append):
+
</ins><span class="cx"> 2015-01-29 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r179357 and r179358.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCopiedBlockInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CopiedBlockInlines.h (179406 => 179407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CopiedBlockInlines.h 2015-01-30 19:09:14 UTC (rev 179406)
+++ trunk/Source/JavaScriptCore/heap/CopiedBlockInlines.h 2015-01-30 19:57:35 UTC (rev 179407)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_workList)
</span><del>- m_workList = std::make_unique<CopyWorkList>(Heap::heap(owner)->blockAllocator());
</del><ins>+ m_workList = std::make_unique<CopyWorkList>();
</ins><span class="cx">
</span><span class="cx"> m_workList->append(CopyWorklistItem(owner, token));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCopyWorkListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CopyWorkList.h (179406 => 179407)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CopyWorkList.h 2015-01-30 19:09:14 UTC (rev 179406)
+++ trunk/Source/JavaScriptCore/heap/CopyWorkList.h 2015-01-30 19:57:35 UTC (rev 179407)
</span><span class="lines">@@ -57,12 +57,19 @@
</span><span class="cx"> uintptr_t m_value;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class CopyWorkListSegment : public HeapBlock<CopyWorkListSegment> {
</del><ins>+class CopyWorkListSegment : public DoublyLinkedListNode<CopyWorkListSegment> {
+ friend class WTF::DoublyLinkedListNode<CopyWorkListSegment>;
</ins><span class="cx"> public:
</span><del>- static CopyWorkListSegment* create(DeadBlock* block)
</del><ins>+ static CopyWorkListSegment* create()
</ins><span class="cx"> {
</span><del>- return new (NotNull, block) CopyWorkListSegment(block->region());
</del><ins>+ return new (NotNull, fastMalloc(blockSize)) CopyWorkListSegment();
</ins><span class="cx"> }
</span><ins>+
+ static void destroy(CopyWorkListSegment* segment)
+ {
+ segment->~CopyWorkListSegment();
+ fastFree(segment);
+ }
</ins><span class="cx">
</span><span class="cx"> size_t size() { return m_size; }
</span><span class="cx"> bool isFull() { return reinterpret_cast<char*>(&data()[size()]) >= endOfBlock(); }
</span><span class="lines">@@ -78,8 +85,8 @@
</span><span class="cx"> static const size_t blockSize = 512;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- CopyWorkListSegment(Region* region)
- : HeapBlock<CopyWorkListSegment>(region)
</del><ins>+ CopyWorkListSegment()
+ : DoublyLinkedListNode<CopyWorkListSegment>()
</ins><span class="cx"> , m_size(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -87,6 +94,8 @@
</span><span class="cx"> CopyWorklistItem* data() { return reinterpret_cast<CopyWorklistItem*>(this + 1); }
</span><span class="cx"> char* endOfBlock() { return reinterpret_cast<char*>(this) + blockSize; }
</span><span class="cx">
</span><ins>+ CopyWorkListSegment* m_prev;
+ CopyWorkListSegment* m_next;
</ins><span class="cx"> size_t m_size;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -143,7 +152,7 @@
</span><span class="cx"> public:
</span><span class="cx"> typedef CopyWorkListIterator iterator;
</span><span class="cx">
</span><del>- CopyWorkList(BlockAllocator&);
</del><ins>+ CopyWorkList();
</ins><span class="cx"> ~CopyWorkList();
</span><span class="cx">
</span><span class="cx"> void append(CopyWorklistItem);
</span><span class="lines">@@ -152,24 +161,22 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> DoublyLinkedList<CopyWorkListSegment> m_segments;
</span><del>- BlockAllocator& m_blockAllocator;
</del><span class="cx"> };
</span><span class="cx">
</span><del>-inline CopyWorkList::CopyWorkList(BlockAllocator& blockAllocator)
- : m_blockAllocator(blockAllocator)
</del><ins>+inline CopyWorkList::CopyWorkList()
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline CopyWorkList::~CopyWorkList()
</span><span class="cx"> {
</span><span class="cx"> while (!m_segments.isEmpty())
</span><del>- m_blockAllocator.deallocate(CopyWorkListSegment::destroy(m_segments.removeHead()));
</del><ins>+ CopyWorkListSegment::destroy(m_segments.removeHead());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void CopyWorkList::append(CopyWorklistItem item)
</span><span class="cx"> {
</span><span class="cx"> if (m_segments.isEmpty() || m_segments.tail()->isFull())
</span><del>- m_segments.append(CopyWorkListSegment::create(m_blockAllocator.allocate<CopyWorkListSegment>()));
</del><ins>+ m_segments.append(CopyWorkListSegment::create());
</ins><span class="cx">
</span><span class="cx"> ASSERT(!m_segments.tail()->isFull());
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>