<!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>[181210] 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/181210">181210</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-03-07 11:04:08 -0800 (Sat, 07 Mar 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 Mark Hahnenberg.
Re-landing just the MarkedBlock piece of this patch.
* heap/MarkedAllocator.cpp:
(JSC::MarkedAllocator::allocateBlock):
* heap/MarkedBlock.cpp:
(JSC::MarkedBlock::create):
(JSC::MarkedBlock::destroy):
(JSC::MarkedBlock::MarkedBlock):
* heap/MarkedBlock.h:
(JSC::MarkedBlock::capacity):
* heap/MarkedSpace.cpp:
(JSC::MarkedSpace::freeBlock):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedAllocatorcpp">trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedBlockcpp">trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedBlockh">trunk/Source/JavaScriptCore/heap/MarkedBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedSpacecpp">trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (181209 => 181210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-03-07 18:03:10 UTC (rev 181209)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-03-07 19:04:08 UTC (rev 181210)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-03-06 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 MarkedBlock piece of this patch.
+
+ * heap/MarkedAllocator.cpp:
+ (JSC::MarkedAllocator::allocateBlock):
+ * heap/MarkedBlock.cpp:
+ (JSC::MarkedBlock::create):
+ (JSC::MarkedBlock::destroy):
+ (JSC::MarkedBlock::MarkedBlock):
+ * heap/MarkedBlock.h:
+ (JSC::MarkedBlock::capacity):
+ * heap/MarkedSpace.cpp:
+ (JSC::MarkedSpace::freeBlock):
+
</ins><span class="cx"> 2015-03-07 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> fromGlobalCode has an unused Debugger* argument
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedAllocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp (181209 => 181210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp 2015-03-07 18:03:10 UTC (rev 181209)
+++ trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp 2015-03-07 19:04:08 UTC (rev 181210)
</span><span class="lines">@@ -180,9 +180,7 @@
</span><span class="cx">
</span><span class="cx"> size_t cellSize = m_cellSize ? m_cellSize : WTF::roundUpToMultipleOf<MarkedBlock::atomSize>(bytes);
</span><span class="cx">
</span><del>- if (blockSize == MarkedBlock::blockSize)
- return MarkedBlock::create(m_heap->blockAllocator().allocate<MarkedBlock>(), this, cellSize, m_destructorType);
- return MarkedBlock::create(m_heap->blockAllocator().allocateCustomSize(blockSize, MarkedBlock::blockSize), this, cellSize, m_destructorType);
</del><ins>+ return MarkedBlock::create(this, blockSize, cellSize, m_destructorType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MarkedAllocator::addBlock(MarkedBlock* block)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp (181209 => 181210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp 2015-03-07 18:03:10 UTC (rev 181209)
+++ trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp 2015-03-07 19:04:08 UTC (rev 181210)
</span><span class="lines">@@ -33,17 +33,22 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-MarkedBlock* MarkedBlock::create(DeadBlock* block, MarkedAllocator* allocator, size_t cellSize, DestructorType destructorType)
</del><ins>+MarkedBlock* MarkedBlock::create(MarkedAllocator* allocator, size_t capacity, size_t cellSize, DestructorType destructorType)
</ins><span class="cx"> {
</span><del>- ASSERT(reinterpret_cast<size_t>(block) == (reinterpret_cast<size_t>(block) & blockMask));
- Region* region = block->region();
- return new (NotNull, block) MarkedBlock(region, allocator, cellSize, destructorType);
</del><ins>+ return new (NotNull, fastAlignedMalloc(blockSize, capacity)) MarkedBlock(allocator, capacity, cellSize, destructorType);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-MarkedBlock::MarkedBlock(Region* region, MarkedAllocator* allocator, size_t cellSize, DestructorType destructorType)
- : HeapBlock<MarkedBlock>(region)
</del><ins>+void MarkedBlock::destroy(MarkedBlock* block)
+{
+ block->~MarkedBlock();
+ fastAlignedFree(block);
+}
+
+MarkedBlock::MarkedBlock(MarkedAllocator* allocator, size_t capacity, size_t cellSize, DestructorType destructorType)
+ : DoublyLinkedListNode<MarkedBlock>()
</ins><span class="cx"> , m_atomsPerCell((cellSize + atomSize - 1) / atomSize)
</span><del>- , m_endAtom((allocator->cellSize() ? atomsPerBlock : region->blockSize() / atomSize) - m_atomsPerCell + 1)
</del><ins>+ , m_endAtom((allocator->cellSize() ? atomsPerBlock : capacity / atomSize) - m_atomsPerCell + 1)
+ , m_capacity(capacity)
</ins><span class="cx"> , m_destructorType(destructorType)
</span><span class="cx"> , m_allocator(allocator)
</span><span class="cx"> , m_state(New) // All cells start out unmarked.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedBlock.h (181209 => 181210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedBlock.h 2015-03-07 18:03:10 UTC (rev 181209)
+++ trunk/Source/JavaScriptCore/heap/MarkedBlock.h 2015-03-07 19:04:08 UTC (rev 181210)
</span><span class="lines">@@ -69,7 +69,8 @@
</span><span class="cx"> // size is equal to the difference between the cell size and the object
</span><span class="cx"> // size.
</span><span class="cx">
</span><del>- class MarkedBlock : public HeapBlock<MarkedBlock> {
</del><ins>+ class MarkedBlock : public DoublyLinkedListNode<MarkedBlock> {
+ friend class WTF::DoublyLinkedListNode<MarkedBlock>;
</ins><span class="cx"> friend class LLIntOffsetsExtractor;
</span><span class="cx"> friend struct VerifyMarkedOrRetired;
</span><span class="cx"> public:
</span><span class="lines">@@ -113,7 +114,8 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum DestructorType { None, ImmortalStructure, Normal };
</span><del>- static MarkedBlock* create(DeadBlock*, MarkedAllocator*, size_t cellSize, DestructorType);
</del><ins>+ static MarkedBlock* create(MarkedAllocator*, size_t capacity, size_t cellSize, DestructorType);
+ static void destroy(MarkedBlock*);
</ins><span class="cx">
</span><span class="cx"> static bool isAtomAligned(const void*);
</span><span class="cx"> static MarkedBlock* blockFor(const void*);
</span><span class="lines">@@ -194,12 +196,15 @@
</span><span class="cx">
</span><span class="cx"> typedef char Atom[atomSize];
</span><span class="cx">
</span><del>- MarkedBlock(Region*, MarkedAllocator*, size_t cellSize, DestructorType);
</del><ins>+ MarkedBlock(MarkedAllocator*, size_t capacity, size_t cellSize, DestructorType);
</ins><span class="cx"> Atom* atoms();
</span><span class="cx"> size_t atomNumber(const void*);
</span><span class="cx"> template<DestructorType> void callDestructor(JSCell*);
</span><span class="cx"> template<BlockState, SweepMode, DestructorType> FreeList specializedSweep();
</span><span class="cx">
</span><ins>+ MarkedBlock* m_prev;
+ MarkedBlock* m_next;
+
</ins><span class="cx"> size_t m_atomsPerCell;
</span><span class="cx"> size_t m_endAtom; // This is a fuzzy end. Always test for < m_endAtom.
</span><span class="cx"> #if ENABLE(PARALLEL_GC)
</span><span class="lines">@@ -211,6 +216,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> std::unique_ptr<WTF::Bitmap<atomsPerBlock>> m_newlyAllocated;
</span><span class="cx">
</span><ins>+ size_t m_capacity;
</ins><span class="cx"> DestructorType m_destructorType;
</span><span class="cx"> MarkedAllocator* m_allocator;
</span><span class="cx"> BlockState m_state;
</span><span class="lines">@@ -333,7 +339,7 @@
</span><span class="cx">
</span><span class="cx"> inline size_t MarkedBlock::capacity()
</span><span class="cx"> {
</span><del>- return region()->blockSize();
</del><ins>+ return m_capacity;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline size_t MarkedBlock::atomNumber(const void* p)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedSpacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp (181209 => 181210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp 2015-03-07 18:03:10 UTC (rev 181209)
+++ trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp 2015-03-07 19:04:08 UTC (rev 181210)
</span><span class="lines">@@ -248,11 +248,7 @@
</span><span class="cx"> block->allocator()->removeBlock(block);
</span><span class="cx"> m_capacity -= block->capacity();
</span><span class="cx"> m_blocks.remove(block);
</span><del>- if (block->capacity() == MarkedBlock::blockSize) {
- m_heap->blockAllocator().deallocate(MarkedBlock::destroy(block));
- return;
- }
- m_heap->blockAllocator().deallocateCustomSize(MarkedBlock::destroy(block));
</del><ins>+ MarkedBlock::destroy(block);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MarkedSpace::freeOrShrinkBlock(MarkedBlock* block)
</span></span></pre>
</div>
</div>
</body>
</html>