<!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>[179192] trunk/Source</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/179192">179192</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-01-27 10:29:29 -0800 (Tue, 27 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 Mark Hahnenberg.
Source/JavaScriptCore:
Removes some more custom allocation code.
Looks like a speedup. (See results attached to bugzilla.)
Will hopefully reduce memory use by improving sharing between the GC and
malloc heaps.
* API/JSBase.cpp:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.xcodeproj/project.pbxproj: Feed the compiler.
* heap/BlockAllocator.cpp: Removed.
* heap/BlockAllocator.h: Removed. No need for a custom allocator anymore.
* heap/CodeBlockSet.cpp:
(JSC::CodeBlockSet::CodeBlockSet):
* heap/CodeBlockSet.h: Feed the compiler.
* heap/CopiedBlock.h:
(JSC::CopiedBlock::createNoZeroFill):
(JSC::CopiedBlock::create):
(JSC::CopiedBlock::CopiedBlock):
(JSC::CopiedBlock::isOversize):
(JSC::CopiedBlock::payloadEnd):
(JSC::CopiedBlock::capacity):
* heap/CopiedBlockInlines.h:
(JSC::CopiedBlock::reportLiveBytes): Each copied block now tracks its
own size, since we can't rely on Region to tell us our size anymore.
* heap/CopiedSpace.cpp:
(JSC::CopiedSpace::~CopiedSpace):
(JSC::CopiedSpace::tryAllocateOversize):
(JSC::CopiedSpace::tryReallocateOversize):
* heap/CopiedSpaceInlines.h:
(JSC::CopiedSpace::recycleEvacuatedBlock):
(JSC::CopiedSpace::recycleBorrowedBlock):
(JSC::CopiedSpace::allocateBlockForCopyingPhase):
(JSC::CopiedSpace::allocateBlock):
(JSC::CopiedSpace::startedCopying): Deallocate blocks directly, rather
than pushing them onto the block allocator's free list; the block
allocator doesn't exist anymore.
* heap/CopyWorkList.h:
(JSC::CopyWorkListSegment::create):
(JSC::CopyWorkListSegment::CopyWorkListSegment):
(JSC::CopyWorkList::~CopyWorkList):
(JSC::CopyWorkList::append):
(JSC::CopyWorkList::CopyWorkList): Deleted.
* heap/GCSegmentedArray.h:
(JSC::GCArraySegment::GCArraySegment):
* heap/GCSegmentedArrayInlines.h:
(JSC::GCSegmentedArray<T>::GCSegmentedArray):
(JSC::GCSegmentedArray<T>::~GCSegmentedArray):
(JSC::GCSegmentedArray<T>::clear):
(JSC::GCSegmentedArray<T>::expand):
(JSC::GCSegmentedArray<T>::refill):
(JSC::GCArraySegment<T>::create):
* heap/GCThreadSharedData.cpp:
(JSC::GCThreadSharedData::GCThreadSharedData):
* heap/GCThreadSharedData.h: Feed the compiler.
* heap/HandleBlock.h:
* heap/HandleBlockInlines.h:
(JSC::HandleBlock::create):
(JSC::HandleBlock::HandleBlock):
(JSC::HandleBlock::payloadEnd):
* heap/HandleSet.cpp:
(JSC::HandleSet::~HandleSet):
(JSC::HandleSet::grow): Same as above.
* heap/Heap.cpp:
(JSC::Heap::Heap):
* heap/Heap.h: Removed the block allocator since it is unused now.
* heap/HeapBlock.h:
(JSC::HeapBlock::destroy):
(JSC::HeapBlock::HeapBlock):
(JSC::HeapBlock::region): Deleted. Removed the Region pointer from each
HeapBlock since a HeapBlock is just a normal allocation now.
* heap/HeapInlines.h:
(JSC::Heap::blockAllocator): Deleted.
* heap/HeapTimer.cpp:
* heap/MarkStack.cpp:
(JSC::MarkStackArray::MarkStackArray):
* heap/MarkStack.h: Feed the compiler.
* heap/MarkedAllocator.cpp:
(JSC::MarkedAllocator::allocateBlock): No need to use a custom code path
based on size, since we use a general purpose allocator now.
* heap/MarkedBlock.cpp:
(JSC::MarkedBlock::create):
(JSC::MarkedBlock::destroy):
(JSC::MarkedBlock::MarkedBlock):
* heap/MarkedBlock.h:
(JSC::MarkedBlock::capacity): Track block size explicitly, like CopiedBlock.
* heap/MarkedSpace.cpp:
(JSC::MarkedSpace::freeBlock):
* heap/MarkedSpace.h:
* heap/Region.h: Removed.
* heap/SlotVisitor.cpp:
(JSC::SlotVisitor::SlotVisitor): Removed reference to block allocator.
* heap/SuperRegion.cpp: Removed.
* heap/SuperRegion.h: Removed.
* heap/WeakBlock.cpp:
(JSC::WeakBlock::create):
(JSC::WeakBlock::WeakBlock):
* heap/WeakBlock.h:
* heap/WeakSet.cpp:
(JSC::WeakSet::~WeakSet):
(JSC::WeakSet::addAllocator):
(JSC::WeakSet::removeAllocator): Removed reference to block allocator.
Source/WebCore:
* platform/cocoa/MemoryPressureHandlerCocoa.mm:
(WebCore::MemoryPressureHandler::install): Be sure to release other
memory after GC and not before, since GC might contribute to free
malloc pages now.
Source/WTF:
New interface for aligned allocation: fastAlignedMalloc / fastAlignedFree.
We require a special function call on free because Windows.
* wtf/FastMalloc.cpp:
(WTF::fastAlignedMalloc):
(WTF::fastAlignedFree): Do it.
(WTF::do_memalign): Un-ifdef this, since we use it now.
* wtf/FastMalloc.h: Make our new function names visible like the rest
of fastMalloc.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSBasecpp">trunk/Source/JavaScriptCore/API/JSBase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCodeBlockSetcpp">trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCodeBlockSeth">trunk/Source/JavaScriptCore/heap/CodeBlockSet.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCopiedBlockh">trunk/Source/JavaScriptCore/heap/CopiedBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCopiedBlockInlinesh">trunk/Source/JavaScriptCore/heap/CopiedBlockInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCopiedSpacecpp">trunk/Source/JavaScriptCore/heap/CopiedSpace.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCopiedSpaceInlinesh">trunk/Source/JavaScriptCore/heap/CopiedSpaceInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCopyWorkListh">trunk/Source/JavaScriptCore/heap/CopyWorkList.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapGCSegmentedArrayh">trunk/Source/JavaScriptCore/heap/GCSegmentedArray.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapGCSegmentedArrayInlinesh">trunk/Source/JavaScriptCore/heap/GCSegmentedArrayInlines.h</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="#trunkSourceJavaScriptCoreheapHandleBlockh">trunk/Source/JavaScriptCore/heap/HandleBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHandleBlockInlinesh">trunk/Source/JavaScriptCore/heap/HandleBlockInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHandleSetcpp">trunk/Source/JavaScriptCore/heap/HandleSet.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeaph">trunk/Source/JavaScriptCore/heap/Heap.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapBlockh">trunk/Source/JavaScriptCore/heap/HeapBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapInlinesh">trunk/Source/JavaScriptCore/heap/HeapInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapTimercpp">trunk/Source/JavaScriptCore/heap/HeapTimer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkStackcpp">trunk/Source/JavaScriptCore/heap/MarkStack.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkStackh">trunk/Source/JavaScriptCore/heap/MarkStack.h</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>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedSpaceh">trunk/Source/JavaScriptCore/heap/MarkedSpace.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapSlotVisitorcpp">trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapWeakBlockcpp">trunk/Source/JavaScriptCore/heap/WeakBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapWeakBlockh">trunk/Source/JavaScriptCore/heap/WeakBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapWeakSetcpp">trunk/Source/JavaScriptCore/heap/WeakSet.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFastMalloccpp">trunk/Source/WTF/wtf/FastMalloc.cpp</a></li>
<li><a href="#trunkSourceWTFwtfFastMalloch">trunk/Source/WTF/wtf/FastMalloc.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm">trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreheapBlockAllocatorcpp">trunk/Source/JavaScriptCore/heap/BlockAllocator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapBlockAllocatorh">trunk/Source/JavaScriptCore/heap/BlockAllocator.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapRegionh">trunk/Source/JavaScriptCore/heap/Region.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapSuperRegioncpp">trunk/Source/JavaScriptCore/heap/SuperRegion.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapSuperRegionh">trunk/Source/JavaScriptCore/heap/SuperRegion.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSBase.cpp (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSBase.cpp 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/API/JSBase.cpp 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "APICast.h"
</span><span class="cx"> #include "CallFrame.h"
</span><span class="cx"> #include "Completion.h"
</span><ins>+#include "GCActivityCallback.h"
</ins><span class="cx"> #include "InitializeThreading.h"
</span><span class="cx"> #include "JSGlobalObject.h"
</span><span class="cx"> #include "JSLock.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -248,7 +248,6 @@
</span><span class="cx"> disassembler/LLVMDisassembler.cpp
</span><span class="cx"> disassembler/X86Disassembler.cpp
</span><span class="cx">
</span><del>- heap/BlockAllocator.cpp
</del><span class="cx"> heap/CodeBlockSet.cpp
</span><span class="cx"> heap/ConservativeRoots.cpp
</span><span class="cx"> heap/CopiedSpace.cpp
</span><span class="lines">@@ -274,7 +273,6 @@
</span><span class="cx"> heap/MarkedBlock.cpp
</span><span class="cx"> heap/MarkedSpace.cpp
</span><span class="cx"> heap/SlotVisitor.cpp
</span><del>- heap/SuperRegion.cpp
</del><span class="cx"> heap/Weak.cpp
</span><span class="cx"> heap/WeakBlock.cpp
</span><span class="cx"> heap/WeakHandleOwner.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -1,3 +1,131 @@
</span><ins>+2015-01-26 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.
+
+ Removes some more custom allocation code.
+
+ Looks like a speedup. (See results attached to bugzilla.)
+
+ Will hopefully reduce memory use by improving sharing between the GC and
+ malloc heaps.
+
+ * API/JSBase.cpp:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ * JavaScriptCore.xcodeproj/project.pbxproj: Feed the compiler.
+
+ * heap/BlockAllocator.cpp: Removed.
+ * heap/BlockAllocator.h: Removed. No need for a custom allocator anymore.
+
+ * heap/CodeBlockSet.cpp:
+ (JSC::CodeBlockSet::CodeBlockSet):
+ * heap/CodeBlockSet.h: Feed the compiler.
+
+ * heap/CopiedBlock.h:
+ (JSC::CopiedBlock::createNoZeroFill):
+ (JSC::CopiedBlock::create):
+ (JSC::CopiedBlock::CopiedBlock):
+ (JSC::CopiedBlock::isOversize):
+ (JSC::CopiedBlock::payloadEnd):
+ (JSC::CopiedBlock::capacity):
+ * heap/CopiedBlockInlines.h:
+ (JSC::CopiedBlock::reportLiveBytes): Each copied block now tracks its
+ own size, since we can't rely on Region to tell us our size anymore.
+
+ * heap/CopiedSpace.cpp:
+ (JSC::CopiedSpace::~CopiedSpace):
+ (JSC::CopiedSpace::tryAllocateOversize):
+ (JSC::CopiedSpace::tryReallocateOversize):
+ * heap/CopiedSpaceInlines.h:
+ (JSC::CopiedSpace::recycleEvacuatedBlock):
+ (JSC::CopiedSpace::recycleBorrowedBlock):
+ (JSC::CopiedSpace::allocateBlockForCopyingPhase):
+ (JSC::CopiedSpace::allocateBlock):
+ (JSC::CopiedSpace::startedCopying): Deallocate blocks directly, rather
+ than pushing them onto the block allocator's free list; the block
+ allocator doesn't exist anymore.
+
+ * heap/CopyWorkList.h:
+ (JSC::CopyWorkListSegment::create):
+ (JSC::CopyWorkListSegment::CopyWorkListSegment):
+ (JSC::CopyWorkList::~CopyWorkList):
+ (JSC::CopyWorkList::append):
+ (JSC::CopyWorkList::CopyWorkList): Deleted.
+ * heap/GCSegmentedArray.h:
+ (JSC::GCArraySegment::GCArraySegment):
+ * heap/GCSegmentedArrayInlines.h:
+ (JSC::GCSegmentedArray<T>::GCSegmentedArray):
+ (JSC::GCSegmentedArray<T>::~GCSegmentedArray):
+ (JSC::GCSegmentedArray<T>::clear):
+ (JSC::GCSegmentedArray<T>::expand):
+ (JSC::GCSegmentedArray<T>::refill):
+ (JSC::GCArraySegment<T>::create):
+ * heap/GCThreadSharedData.cpp:
+ (JSC::GCThreadSharedData::GCThreadSharedData):
+ * heap/GCThreadSharedData.h: Feed the compiler.
+
+ * heap/HandleBlock.h:
+ * heap/HandleBlockInlines.h:
+ (JSC::HandleBlock::create):
+ (JSC::HandleBlock::HandleBlock):
+ (JSC::HandleBlock::payloadEnd):
+ * heap/HandleSet.cpp:
+ (JSC::HandleSet::~HandleSet):
+ (JSC::HandleSet::grow): Same as above.
+
+ * heap/Heap.cpp:
+ (JSC::Heap::Heap):
+ * heap/Heap.h: Removed the block allocator since it is unused now.
+
+ * heap/HeapBlock.h:
+ (JSC::HeapBlock::destroy):
+ (JSC::HeapBlock::HeapBlock):
+ (JSC::HeapBlock::region): Deleted. Removed the Region pointer from each
+ HeapBlock since a HeapBlock is just a normal allocation now.
+
+ * heap/HeapInlines.h:
+ (JSC::Heap::blockAllocator): Deleted.
+
+ * heap/HeapTimer.cpp:
+ * heap/MarkStack.cpp:
+ (JSC::MarkStackArray::MarkStackArray):
+ * heap/MarkStack.h: Feed the compiler.
+
+ * heap/MarkedAllocator.cpp:
+ (JSC::MarkedAllocator::allocateBlock): No need to use a custom code path
+ based on size, since we use a general purpose allocator now.
+
+ * heap/MarkedBlock.cpp:
+ (JSC::MarkedBlock::create):
+ (JSC::MarkedBlock::destroy):
+ (JSC::MarkedBlock::MarkedBlock):
+ * heap/MarkedBlock.h:
+ (JSC::MarkedBlock::capacity): Track block size explicitly, like CopiedBlock.
+
+ * heap/MarkedSpace.cpp:
+ (JSC::MarkedSpace::freeBlock):
+ * heap/MarkedSpace.h:
+
+ * heap/Region.h: Removed.
+
+ * heap/SlotVisitor.cpp:
+ (JSC::SlotVisitor::SlotVisitor): Removed reference to block allocator.
+
+ * heap/SuperRegion.cpp: Removed.
+ * heap/SuperRegion.h: Removed.
+
+ * heap/WeakBlock.cpp:
+ (JSC::WeakBlock::create):
+ (JSC::WeakBlock::WeakBlock):
+ * heap/WeakBlock.h:
+ * heap/WeakSet.cpp:
+ (JSC::WeakSet::~WeakSet):
+ (JSC::WeakSet::addAllocator):
+ (JSC::WeakSet::removeAllocator): Removed reference to block allocator.
+
</ins><span class="cx"> 2015-01-27 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [ARM] Typo fix after r176083
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -530,7 +530,6 @@
</span><span class="cx"> <ClCompile Include="..\ftl\FTLUnwindInfo.cpp" />
</span><span class="cx"> <ClCompile Include="..\ftl\FTLValueFormat.cpp" />
</span><span class="cx"> <ClCompile Include="..\ftl\FTLValueRange.cpp" />
</span><del>- <ClCompile Include="..\heap\BlockAllocator.cpp" />
</del><span class="cx"> <ClCompile Include="..\heap\CodeBlockSet.cpp" />
</span><span class="cx"> <ClCompile Include="..\heap\ConservativeRoots.cpp" />
</span><span class="cx"> <ClCompile Include="..\heap\CopiedSpace.cpp" />
</span><span class="lines">@@ -556,7 +555,6 @@
</span><span class="cx"> <ClCompile Include="..\heap\MarkedSpace.cpp" />
</span><span class="cx"> <ClCompile Include="..\heap\MarkStack.cpp" />
</span><span class="cx"> <ClCompile Include="..\heap\SlotVisitor.cpp" />
</span><del>- <ClCompile Include="..\heap\SuperRegion.cpp" />
</del><span class="cx"> <ClCompile Include="..\heap\Weak.cpp" />
</span><span class="cx"> <ClCompile Include="..\heap\WeakBlock.cpp" />
</span><span class="cx"> <ClCompile Include="..\heap\WeakHandleOwner.cpp" />
</span><span class="lines">@@ -1218,7 +1216,6 @@
</span><span class="cx"> <ClInclude Include="..\ftl\FTLValueRange.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLWeight.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLWeightedTarget.h" />
</span><del>- <ClInclude Include="..\heap\BlockAllocator.h" />
</del><span class="cx"> <ClInclude Include="..\heap\CodeBlockSet.h" />
</span><span class="cx"> <ClInclude Include="..\heap\ConservativeRoots.h" />
</span><span class="cx"> <ClInclude Include="..\heap\CopiedAllocator.h" />
</span><span class="lines">@@ -1268,12 +1265,10 @@
</span><span class="cx"> <ClInclude Include="..\heap\MarkedSpace.h" />
</span><span class="cx"> <ClInclude Include="..\heap\MarkStack.h" />
</span><span class="cx"> <ClInclude Include="..\heap\RecursiveAllocationScope.h" />
</span><del>- <ClInclude Include="..\heap\Region.h" />
</del><span class="cx"> <ClInclude Include="..\heap\SlotVisitor.h" />
</span><span class="cx"> <ClInclude Include="..\heap\SlotVisitorInlines.h" />
</span><span class="cx"> <ClInclude Include="..\heap\Strong.h" />
</span><span class="cx"> <ClInclude Include="..\heap\StrongInlines.h" />
</span><del>- <ClInclude Include="..\heap\SuperRegion.h" />
</del><span class="cx"> <ClInclude Include="..\heap\TinyBloomFilter.h" />
</span><span class="cx"> <ClInclude Include="..\heap\UnconditionalFinalizer.h" />
</span><span class="cx"> <ClInclude Include="..\heap\Weak.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -237,9 +237,6 @@
</span><span class="cx"> <ClCompile Include="..\disassembler\Disassembler.cpp">
</span><span class="cx"> <Filter>disassembler</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\heap\BlockAllocator.cpp">
- <Filter>heap</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\heap\ConservativeRoots.cpp">
</span><span class="cx"> <Filter>heap</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -309,9 +306,6 @@
</span><span class="cx"> <ClCompile Include="..\heap\SlotVisitor.cpp">
</span><span class="cx"> <Filter>heap</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\heap\SuperRegion.cpp">
- <Filter>heap</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\heap\Weak.cpp">
</span><span class="cx"> <Filter>heap</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -2048,9 +2042,6 @@
</span><span class="cx"> <ClInclude Include="..\disassembler\Disassembler.h">
</span><span class="cx"> <Filter>disassembler</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\heap\BlockAllocator.h">
- <Filter>heap</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\heap\ConservativeRoots.h">
</span><span class="cx"> <Filter>heap</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -2189,9 +2180,6 @@
</span><span class="cx"> <ClInclude Include="..\heap\RecursiveAllocationScope.h">
</span><span class="cx"> <Filter>heap</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\heap\Region.h">
- <Filter>heap</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\heap\SlotVisitor.h">
</span><span class="cx"> <Filter>heap</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -2204,9 +2192,6 @@
</span><span class="cx"> <ClInclude Include="..\heap\StrongInlines.h">
</span><span class="cx"> <Filter>heap</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\heap\SuperRegion.h">
- <Filter>heap</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\heap\TinyBloomFilter.h">
</span><span class="cx"> <Filter>heap</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -813,8 +813,6 @@
</span><span class="cx"> 147F39D5107EC37600427A48 /* JSString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC02E9B60E1842FA000F9297 /* JSString.cpp */; };
</span><span class="cx"> 147F39D6107EC37600427A48 /* JSCJSValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F692A8870255597D01FF60F7 /* JSCJSValue.cpp */; };
</span><span class="cx"> 147F39D7107EC37600427A48 /* JSEnvironmentRecord.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC22A39A0E16E14800AF21C8 /* JSEnvironmentRecord.cpp */; };
</span><del>- 14816E1B154CC56C00B8054C /* BlockAllocator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14816E19154CC56C00B8054C /* BlockAllocator.cpp */; };
- 14816E1C154CC56C00B8054C /* BlockAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 14816E1A154CC56C00B8054C /* BlockAllocator.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 1482B74E0A43032800517CFC /* JSStringRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1482B74C0A43032800517CFC /* JSStringRef.cpp */; };
</span><span class="cx"> 1482B7E40A43076000517CFC /* JSObjectRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1482B7E20A43076000517CFC /* JSObjectRef.cpp */; };
</span><span class="cx"> 14874AE315EBDE4A002E3587 /* JSNameScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14874ADF15EBDE4A002E3587 /* JSNameScope.cpp */; };
</span><span class="lines">@@ -1521,7 +1519,6 @@
</span><span class="cx"> BCFD8C920EEB2EE700283848 /* JumpTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCFD8C900EEB2EE700283848 /* JumpTable.cpp */; };
</span><span class="cx"> BCFD8C930EEB2EE700283848 /* JumpTable.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFD8C910EEB2EE700283848 /* JumpTable.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> C20328201981979D0088B499 /* CustomGlobalObjectClassTest.c in Sources */ = {isa = PBXBuildFile; fileRef = C203281E1981979D0088B499 /* CustomGlobalObjectClassTest.c */; };
</span><del>- C20B25991706536200C21F4E /* Region.h in Headers */ = {isa = PBXBuildFile; fileRef = C20B25981706536200C21F4E /* Region.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> C20BA92D16BB1C1500B3AEA2 /* StructureRareDataInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = C20BA92C16BB1C1500B3AEA2 /* StructureRareDataInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> C21122E115DD9AB300790E3A /* GCThreadSharedData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C21122DE15DD9AB300790E3A /* GCThreadSharedData.cpp */; };
</span><span class="cx"> C21122E215DD9AB300790E3A /* GCThreadSharedData.h in Headers */ = {isa = PBXBuildFile; fileRef = C21122DF15DD9AB300790E3A /* GCThreadSharedData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -1562,8 +1559,6 @@
</span><span class="cx"> C2CF39C116E15A8100DD69BE /* JSAPIWrapperObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = C2CF39BF16E15A8100DD69BE /* JSAPIWrapperObject.mm */; };
</span><span class="cx"> C2CF39C216E15A8100DD69BE /* JSAPIWrapperObject.h in Headers */ = {isa = PBXBuildFile; fileRef = C2CF39C016E15A8100DD69BE /* JSAPIWrapperObject.h */; };
</span><span class="cx"> C2DA778318E259990066FCB6 /* HeapInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = C2DA778218E259990066FCB6 /* HeapInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- C2DF442F1707AC0100A5CA96 /* SuperRegion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2DF442D1707AC0100A5CA96 /* SuperRegion.cpp */; };
- C2DF44301707AC0100A5CA96 /* SuperRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = C2DF442E1707AC0100A5CA96 /* SuperRegion.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> C2E526BD1590EF000054E48D /* HeapTimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2E526BB1590EF000054E48D /* HeapTimer.cpp */; };
</span><span class="cx"> C2E526BE1590EF000054E48D /* HeapTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = C2E526BC1590EF000054E48D /* HeapTimer.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> C2EAA3FA149A835E00FCE112 /* CopiedSpace.h in Headers */ = {isa = PBXBuildFile; fileRef = C2EAA3F8149A830800FCE112 /* CopiedSpace.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2428,8 +2423,6 @@
</span><span class="cx"> 147B83AA0E6DB8C9004775A4 /* BatchedTransitionOptimizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BatchedTransitionOptimizer.h; sourceTree = "<group>"; };
</span><span class="cx"> 147B84620E6DE6B1004775A4 /* PutPropertySlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PutPropertySlot.h; sourceTree = "<group>"; };
</span><span class="cx"> 1480DB9B0DDC227F003CFDF2 /* DebuggerCallFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebuggerCallFrame.h; sourceTree = "<group>"; };
</span><del>- 14816E19154CC56C00B8054C /* BlockAllocator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BlockAllocator.cpp; sourceTree = "<group>"; };
- 14816E1A154CC56C00B8054C /* BlockAllocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlockAllocator.h; sourceTree = "<group>"; };
</del><span class="cx"> 1482B6EA0A4300B300517CFC /* JSValueRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSValueRef.h; sourceTree = "<group>"; };
</span><span class="cx"> 1482B74B0A43032800517CFC /* JSStringRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStringRef.h; sourceTree = "<group>"; };
</span><span class="cx"> 1482B74C0A43032800517CFC /* JSStringRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStringRef.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -3203,7 +3196,6 @@
</span><span class="cx"> BCFD8C910EEB2EE700283848 /* JumpTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JumpTable.h; sourceTree = "<group>"; };
</span><span class="cx"> C203281E1981979D0088B499 /* CustomGlobalObjectClassTest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = CustomGlobalObjectClassTest.c; path = API/tests/CustomGlobalObjectClassTest.c; sourceTree = "<group>"; };
</span><span class="cx"> C203281F1981979D0088B499 /* CustomGlobalObjectClassTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomGlobalObjectClassTest.h; path = API/tests/CustomGlobalObjectClassTest.h; sourceTree = "<group>"; };
</span><del>- C20B25981706536200C21F4E /* Region.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Region.h; sourceTree = "<group>"; };
</del><span class="cx"> C20BA92C16BB1C1500B3AEA2 /* StructureRareDataInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StructureRareDataInlines.h; sourceTree = "<group>"; };
</span><span class="cx"> C21122DE15DD9AB300790E3A /* GCThreadSharedData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GCThreadSharedData.cpp; sourceTree = "<group>"; };
</span><span class="cx"> C21122DF15DD9AB300790E3A /* GCThreadSharedData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCThreadSharedData.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3246,8 +3238,6 @@
</span><span class="cx"> C2CF39BF16E15A8100DD69BE /* JSAPIWrapperObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = JSAPIWrapperObject.mm; sourceTree = "<group>"; };
</span><span class="cx"> C2CF39C016E15A8100DD69BE /* JSAPIWrapperObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAPIWrapperObject.h; sourceTree = "<group>"; };
</span><span class="cx"> C2DA778218E259990066FCB6 /* HeapInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeapInlines.h; sourceTree = "<group>"; };
</span><del>- C2DF442D1707AC0100A5CA96 /* SuperRegion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SuperRegion.cpp; sourceTree = "<group>"; };
- C2DF442E1707AC0100A5CA96 /* SuperRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SuperRegion.h; sourceTree = "<group>"; };
</del><span class="cx"> C2E526BB1590EF000054E48D /* HeapTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HeapTimer.cpp; sourceTree = "<group>"; };
</span><span class="cx"> C2E526BC1590EF000054E48D /* HeapTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeapTimer.h; sourceTree = "<group>"; };
</span><span class="cx"> C2EAA3F8149A830800FCE112 /* CopiedSpace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CopiedSpace.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3826,8 +3816,6 @@
</span><span class="cx"> ADDB1F6218D77DB7009B58A8 /* OpaqueRootSet.h */,
</span><span class="cx"> 2AACE63A18CA5A0300ED0191 /* GCActivityCallback.cpp */,
</span><span class="cx"> 2AACE63B18CA5A0300ED0191 /* GCActivityCallback.h */,
</span><del>- 14816E19154CC56C00B8054C /* BlockAllocator.cpp */,
- 14816E1A154CC56C00B8054C /* BlockAllocator.h */,
</del><span class="cx"> 0FD8A31117D4326C00CA2C40 /* CodeBlockSet.cpp */,
</span><span class="cx"> 0FD8A31217D4326C00CA2C40 /* CodeBlockSet.h */,
</span><span class="cx"> 146B14DB12EB5B12001BEC1B /* ConservativeRoots.cpp */,
</span><span class="lines">@@ -3895,14 +3883,11 @@
</span><span class="cx"> 142D6F0E13539A4100B02E86 /* MarkStack.cpp */,
</span><span class="cx"> 142D6F0F13539A4100B02E86 /* MarkStack.h */,
</span><span class="cx"> 2AAD964918569417001F93BE /* RecursiveAllocationScope.h */,
</span><del>- C20B25981706536200C21F4E /* Region.h */,
</del><span class="cx"> C225494215F7DBAA0065E898 /* SlotVisitor.cpp */,
</span><span class="cx"> 14BA78F013AAB88F005B7C2C /* SlotVisitor.h */,
</span><span class="cx"> 0FCB408515C0A3C30048932B /* SlotVisitorInlines.h */,
</span><span class="cx"> 142E3132134FF0A600AFADB5 /* Strong.h */,
</span><span class="cx"> 145722851437E140005FDE26 /* StrongInlines.h */,
</span><del>- C2DF442D1707AC0100A5CA96 /* SuperRegion.cpp */,
- C2DF442E1707AC0100A5CA96 /* SuperRegion.h */,
</del><span class="cx"> 141448CC13A1783700F5BA1A /* TinyBloomFilter.h */,
</span><span class="cx"> 0F5F08CE146C762F000472A9 /* UnconditionalFinalizer.h */,
</span><span class="cx"> 1ACF7376171CA6FB00C9BB1E /* Weak.cpp */,
</span><span class="lines">@@ -5457,7 +5442,6 @@
</span><span class="cx"> 0F24E54117EA9F5900ABB217 /* AssemblyHelpers.h in Headers */,
</span><span class="cx"> A784A26111D16622005776AC /* ASTBuilder.h in Headers */,
</span><span class="cx"> 866739D213BFDE710023D87C /* BigInteger.h in Headers */,
</span><del>- 14816E1C154CC56C00B8054C /* BlockAllocator.h in Headers */,
</del><span class="cx"> BC18C3EC0E16F5CD00B34460 /* BooleanObject.h in Headers */,
</span><span class="cx"> FEA08620182B7A0400F6D851 /* Breakpoint.h in Headers */,
</span><span class="cx"> A5D2E665195E174000A518E7 /* JSContextRefInternal.h in Headers */,
</span><span class="lines">@@ -6140,7 +6124,6 @@
</span><span class="cx"> BC18C45B0E16F5CD00B34460 /* RegExpObject.h in Headers */,
</span><span class="cx"> BC18C52C0E16FCD200B34460 /* RegExpObject.lut.h in Headers */,
</span><span class="cx"> BCD202C40E1706A7002C7E82 /* RegExpPrototype.h in Headers */,
</span><del>- C20B25991706536200C21F4E /* Region.h in Headers */,
</del><span class="cx"> BC18C45D0E16F5CD00B34460 /* Register.h in Headers */,
</span><span class="cx"> 969A072B0ED1CE6900F1F681 /* RegisterID.h in Headers */,
</span><span class="cx"> 0F6B1CBA1861244C00845D97 /* RegisterPreservationMode.h in Headers */,
</span><span class="lines">@@ -6213,7 +6196,6 @@
</span><span class="cx"> 0F766D3915AE4A1F008F363E /* StructureStubClearingWatchpoint.h in Headers */,
</span><span class="cx"> BCCF0D080EF0AAB900413C8F /* StructureStubInfo.h in Headers */,
</span><span class="cx"> BC9041480EB9250900FE26FA /* StructureTransitionTable.h in Headers */,
</span><del>- C2DF44301707AC0100A5CA96 /* SuperRegion.h in Headers */,
</del><span class="cx"> BC18C46B0E16F5CD00B34460 /* SymbolTable.h in Headers */,
</span><span class="cx"> A784A26411D16622005776AC /* SyntaxChecker.h in Headers */,
</span><span class="cx"> 0F24E54F17EE274900ABB217 /* TempRegisterSet.h in Headers */,
</span><span class="lines">@@ -6760,7 +6742,6 @@
</span><span class="cx"> 0F63945415D07055006A597C /* ArrayProfile.cpp in Sources */,
</span><span class="cx"> 147F39C0107EC37600427A48 /* ArrayPrototype.cpp in Sources */,
</span><span class="cx"> 0F24E54017EA9F5900ABB217 /* AssemblyHelpers.cpp in Sources */,
</span><del>- 14816E1B154CC56C00B8054C /* BlockAllocator.cpp in Sources */,
</del><span class="cx"> 0F69CC88193AC60A0045759E /* DFGFrozenValue.cpp in Sources */,
</span><span class="cx"> 14280863107EC11A0013E7B2 /* BooleanConstructor.cpp in Sources */,
</span><span class="cx"> 14280864107EC11A0013E7B2 /* BooleanObject.cpp in Sources */,
</span><span class="lines">@@ -7282,7 +7263,6 @@
</span><span class="cx"> C2F0F2D116BAEEE900187C19 /* StructureRareData.cpp in Sources */,
</span><span class="cx"> 0F766D3815AE4A1C008F363E /* StructureStubClearingWatchpoint.cpp in Sources */,
</span><span class="cx"> BCCF0D0C0EF0B8A500413C8F /* StructureStubInfo.cpp in Sources */,
</span><del>- C2DF442F1707AC0100A5CA96 /* SuperRegion.cpp in Sources */,
</del><span class="cx"> 0F919D2815856773004A4E7D /* SymbolTable.cpp in Sources */,
</span><span class="cx"> 0FC314131814559100033232 /* TempRegisterSet.cpp in Sources */,
</span><span class="cx"> 0FA2C17B17D7CF84009D015F /* TestRunnerUtils.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapBlockAllocatorcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/heap/BlockAllocator.cpp (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/BlockAllocator.cpp 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/BlockAllocator.cpp 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -1,173 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "BlockAllocator.h"
-
-#include "CopiedBlock.h"
-#include "CopyWorkList.h"
-#include "MarkedBlock.h"
-#include "JSCInlines.h"
-#include "WeakBlock.h"
-#include <wtf/CurrentTime.h>
-
-namespace JSC {
-
-inline ThreadIdentifier createBlockFreeingThread(BlockAllocator* allocator)
-{
- if (!GCActivityCallback::s_shouldCreateGCTimer)
- return 0; // No block freeing thread.
- ThreadIdentifier identifier = createThread(allocator->blockFreeingThreadStartFunc, allocator, "JavaScriptCore::BlockFree");
- RELEASE_ASSERT(identifier);
- return identifier;
-}
-
-BlockAllocator::BlockAllocator()
- : m_superRegion()
- , m_copiedRegionSet(CopiedBlock::blockSize)
- , m_markedRegionSet(MarkedBlock::blockSize)
- , m_fourKBBlockRegionSet(WeakBlock::blockSize)
- , m_workListRegionSet(CopyWorkListSegment::blockSize)
- , m_numberOfEmptyRegions(0)
- , m_isCurrentlyAllocating(false)
- , m_blockFreeingThreadShouldQuit(false)
- , m_blockFreeingThread(createBlockFreeingThread(this))
-{
- m_regionLock.Init();
-}
-
-BlockAllocator::~BlockAllocator()
-{
- releaseFreeRegions();
- {
- std::lock_guard<std::mutex> lock(m_emptyRegionConditionMutex);
- m_blockFreeingThreadShouldQuit = true;
- m_emptyRegionCondition.notify_all();
- }
- if (m_blockFreeingThread)
- waitForThreadCompletion(m_blockFreeingThread);
- ASSERT(allRegionSetsAreEmpty());
- ASSERT(m_emptyRegions.isEmpty());
-}
-
-bool BlockAllocator::allRegionSetsAreEmpty() const
-{
- return m_copiedRegionSet.isEmpty()
- && m_markedRegionSet.isEmpty()
- && m_fourKBBlockRegionSet.isEmpty()
- && m_workListRegionSet.isEmpty();
-}
-
-void BlockAllocator::releaseFreeRegions()
-{
- while (true) {
- Region* region;
- {
- SpinLockHolder locker(&m_regionLock);
- if (!m_numberOfEmptyRegions)
- region = 0;
- else {
- region = m_emptyRegions.removeHead();
- RELEASE_ASSERT(region);
- m_numberOfEmptyRegions--;
- }
- }
-
- if (!region)
- break;
-
- region->destroy();
- }
-}
-
-void BlockAllocator::waitForDuration(std::chrono::milliseconds duration)
-{
- std::unique_lock<std::mutex> lock(m_emptyRegionConditionMutex);
-
- // If this returns early, that's fine, so long as it doesn't do it too
- // frequently. It would only be a bug if this function failed to return
- // when it was asked to do so.
- if (m_blockFreeingThreadShouldQuit)
- return;
-
- m_emptyRegionCondition.wait_for(lock, duration);
-}
-
-void BlockAllocator::blockFreeingThreadStartFunc(void* blockAllocator)
-{
- static_cast<BlockAllocator*>(blockAllocator)->blockFreeingThreadMain();
-}
-
-void BlockAllocator::blockFreeingThreadMain()
-{
- size_t currentNumberOfEmptyRegions;
- while (!m_blockFreeingThreadShouldQuit) {
- // Generally wait for one second before scavenging free blocks. This
- // may return early, particularly when we're being asked to quit.
- waitForDuration(std::chrono::seconds(1));
- if (m_blockFreeingThreadShouldQuit)
- break;
-
- if (m_isCurrentlyAllocating) {
- m_isCurrentlyAllocating = false;
- continue;
- }
-
- // Sleep until there is actually work to do rather than waking up every second to check.
- {
- std::unique_lock<std::mutex> lock(m_emptyRegionConditionMutex);
- SpinLockHolder regionLocker(&m_regionLock);
- while (!m_numberOfEmptyRegions && !m_blockFreeingThreadShouldQuit) {
- m_regionLock.Unlock();
- m_emptyRegionCondition.wait(lock);
- m_regionLock.Lock();
- }
- currentNumberOfEmptyRegions = m_numberOfEmptyRegions;
- }
-
- size_t desiredNumberOfEmptyRegions = currentNumberOfEmptyRegions / 2;
-
- while (!m_blockFreeingThreadShouldQuit) {
- Region* region;
- {
- SpinLockHolder locker(&m_regionLock);
- if (m_numberOfEmptyRegions <= desiredNumberOfEmptyRegions)
- region = 0;
- else {
- region = m_emptyRegions.removeHead();
- RELEASE_ASSERT(region);
- m_numberOfEmptyRegions--;
- }
- }
-
- if (!region)
- break;
-
- region->destroy();
- }
- }
-}
-
-} // namespace JSC
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapBlockAllocatorh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/heap/BlockAllocator.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/BlockAllocator.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/BlockAllocator.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -1,253 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef BlockAllocator_h
-#define BlockAllocator_h
-
-#include "GCActivityCallback.h"
-#include "HeapBlock.h"
-#include "Region.h"
-#include <condition_variable>
-#include <wtf/DoublyLinkedList.h>
-#include <wtf/Forward.h>
-#include <wtf/PageAllocationAligned.h>
-#include <wtf/TCSpinLock.h>
-#include <wtf/Threading.h>
-
-namespace JSC {
-
-class BlockAllocator;
-class CodeBlock;
-class CopiedBlock;
-class CopyWorkListSegment;
-template <typename T> class GCArraySegment;
-class HandleBlock;
-class JSCell;
-class VM;
-class MarkedBlock;
-class WeakBlock;
-
-// Simple allocator to reduce VM cost by holding onto blocks of memory for
-// short periods of time and then freeing them on a secondary thread.
-
-class BlockAllocator {
-public:
- BlockAllocator();
- ~BlockAllocator();
-
- template <typename T> DeadBlock* allocate();
- DeadBlock* allocateCustomSize(size_t blockSize, size_t blockAlignment);
- template <typename T> void deallocate(T*);
- template <typename T> void deallocateCustomSize(T*);
-
- JS_EXPORT_PRIVATE void releaseFreeRegions();
-
-private:
- void waitForDuration(std::chrono::milliseconds);
-
- friend ThreadIdentifier createBlockFreeingThread(BlockAllocator*);
- void blockFreeingThreadMain();
- static void blockFreeingThreadStartFunc(void* heap);
-
- struct RegionSet {
- RegionSet(size_t blockSize)
- : m_numberOfPartialRegions(0)
- , m_blockSize(blockSize)
- {
- }
-
- bool isEmpty() const
- {
- return m_fullRegions.isEmpty() && m_partialRegions.isEmpty();
- }
-
- DoublyLinkedList<Region> m_fullRegions;
- DoublyLinkedList<Region> m_partialRegions;
- size_t m_numberOfPartialRegions;
- size_t m_blockSize;
- };
-
- DeadBlock* tryAllocateFromRegion(RegionSet&, DoublyLinkedList<Region>&, size_t&);
-
- bool allRegionSetsAreEmpty() const;
-
- template <typename T> RegionSet& regionSetFor();
-
- SuperRegion m_superRegion;
- RegionSet m_copiedRegionSet;
- RegionSet m_markedRegionSet;
- // WeakBlocks and GCArraySegments use the same RegionSet since they're the same size.
- RegionSet m_fourKBBlockRegionSet;
- RegionSet m_workListRegionSet;
-
- DoublyLinkedList<Region> m_emptyRegions;
- size_t m_numberOfEmptyRegions;
-
- bool m_isCurrentlyAllocating;
- bool m_blockFreeingThreadShouldQuit;
- SpinLock m_regionLock;
- std::mutex m_emptyRegionConditionMutex;
- std::condition_variable m_emptyRegionCondition;
- ThreadIdentifier m_blockFreeingThread;
-};
-
-inline DeadBlock* BlockAllocator::tryAllocateFromRegion(RegionSet& set, DoublyLinkedList<Region>& regions, size_t& numberOfRegions)
-{
- if (numberOfRegions) {
- ASSERT(!regions.isEmpty());
- Region* region = regions.head();
- ASSERT(!region->isFull());
-
- if (region->isEmpty()) {
- ASSERT(region == m_emptyRegions.head());
- m_numberOfEmptyRegions--;
- set.m_numberOfPartialRegions++;
- region = m_emptyRegions.removeHead()->reset(set.m_blockSize);
- set.m_partialRegions.push(region);
- }
-
- DeadBlock* block = region->allocate();
-
- if (region->isFull()) {
- set.m_numberOfPartialRegions--;
- set.m_fullRegions.push(set.m_partialRegions.removeHead());
- }
-
- return block;
- }
- return 0;
-}
-
-template<typename T>
-inline DeadBlock* BlockAllocator::allocate()
-{
- RegionSet& set = regionSetFor<T>();
- DeadBlock* block;
- m_isCurrentlyAllocating = true;
- {
- SpinLockHolder locker(&m_regionLock);
- if ((block = tryAllocateFromRegion(set, set.m_partialRegions, set.m_numberOfPartialRegions)))
- return block;
- if ((block = tryAllocateFromRegion(set, m_emptyRegions, m_numberOfEmptyRegions)))
- return block;
- }
-
- Region* newRegion = Region::create(&m_superRegion, T::blockSize);
-
- SpinLockHolder locker(&m_regionLock);
- m_emptyRegions.push(newRegion);
- m_numberOfEmptyRegions++;
- block = tryAllocateFromRegion(set, m_emptyRegions, m_numberOfEmptyRegions);
- ASSERT(block);
- return block;
-}
-
-inline DeadBlock* BlockAllocator::allocateCustomSize(size_t blockSize, size_t blockAlignment)
-{
- size_t realSize = WTF::roundUpToMultipleOf(blockAlignment, blockSize);
- Region* newRegion = Region::createCustomSize(&m_superRegion, realSize, blockAlignment);
- DeadBlock* block = newRegion->allocate();
- ASSERT(block);
- return block;
-}
-
-template<typename T>
-inline void BlockAllocator::deallocate(T* block)
-{
- RegionSet& set = regionSetFor<T>();
- bool shouldWakeBlockFreeingThread = false;
- {
- SpinLockHolder locker(&m_regionLock);
- Region* region = block->region();
- ASSERT(!region->isEmpty());
- if (region->isFull())
- set.m_fullRegions.remove(region);
- else {
- set.m_partialRegions.remove(region);
- set.m_numberOfPartialRegions--;
- }
-
- region->deallocate(block);
-
- if (region->isEmpty()) {
- m_emptyRegions.push(region);
- shouldWakeBlockFreeingThread = !m_numberOfEmptyRegions;
- m_numberOfEmptyRegions++;
- } else {
- set.m_partialRegions.push(region);
- set.m_numberOfPartialRegions++;
- }
- }
-
- if (shouldWakeBlockFreeingThread) {
- std::lock_guard<std::mutex> lock(m_emptyRegionConditionMutex);
- m_emptyRegionCondition.notify_one();
- }
-
- if (!m_blockFreeingThread)
- releaseFreeRegions();
-}
-
-template<typename T>
-inline void BlockAllocator::deallocateCustomSize(T* block)
-{
- Region* region = block->region();
- ASSERT(region->isCustomSize());
- region->deallocate(block);
- region->destroy();
-}
-
-#define REGION_SET_FOR(blockType, set) \
- template <> \
- inline BlockAllocator::RegionSet& BlockAllocator::regionSetFor<blockType>() \
- { \
- return set; \
- } \
- template <> \
- inline BlockAllocator::RegionSet& BlockAllocator::regionSetFor<HeapBlock<blockType>>() \
- { \
- return set; \
- } \
-
-REGION_SET_FOR(MarkedBlock, m_markedRegionSet);
-REGION_SET_FOR(CopiedBlock, m_copiedRegionSet);
-REGION_SET_FOR(WeakBlock, m_fourKBBlockRegionSet);
-REGION_SET_FOR(GCArraySegment<const JSCell*>, m_fourKBBlockRegionSet);
-REGION_SET_FOR(GCArraySegment<CodeBlock*>, m_fourKBBlockRegionSet);
-REGION_SET_FOR(CopyWorkListSegment, m_workListRegionSet);
-REGION_SET_FOR(HandleBlock, m_fourKBBlockRegionSet);
-
-#undef REGION_SET_FOR
-
-template <typename T>
-inline BlockAllocator::RegionSet& BlockAllocator::regionSetFor()
-{
- RELEASE_ASSERT_NOT_REACHED();
- return *(RegionSet*)0;
-}
-
-} // namespace JSC
-
-#endif // BlockAllocator_h
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCodeBlockSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx">
</span><span class="cx"> static const bool verbose = false;
</span><span class="cx">
</span><del>-CodeBlockSet::CodeBlockSet(BlockAllocator& blockAllocator)
- : m_currentlyExecuting(blockAllocator)
</del><ins>+CodeBlockSet::CodeBlockSet()
+ : m_currentlyExecuting()
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCodeBlockSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CodeBlockSet.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CodeBlockSet.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/CodeBlockSet.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-class BlockAllocator;
</del><span class="cx"> class CodeBlock;
</span><span class="cx"> class Heap;
</span><span class="cx"> class JSCell;
</span><span class="lines">@@ -50,7 +49,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(CodeBlockSet);
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- CodeBlockSet(BlockAllocator&);
</del><ins>+ CodeBlockSet();
</ins><span class="cx"> ~CodeBlockSet();
</span><span class="cx">
</span><span class="cx"> // Add a CodeBlock. This is only called by CodeBlock constructors.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCopiedBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CopiedBlock.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CopiedBlock.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/CopiedBlock.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -26,12 +26,12 @@
</span><span class="cx"> #ifndef CopiedBlock_h
</span><span class="cx"> #define CopiedBlock_h
</span><span class="cx">
</span><del>-#include "BlockAllocator.h"
</del><span class="cx"> #include "CopyWorkList.h"
</span><span class="cx"> #include "HeapBlock.h"
</span><span class="cx"> #include "JSCJSValue.h"
</span><span class="cx"> #include "Options.h"
</span><span class="cx"> #include <wtf/Atomics.h>
</span><ins>+#include <wtf/TCSpinLock.h>
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -41,8 +41,8 @@
</span><span class="cx"> friend class CopiedSpace;
</span><span class="cx"> friend class CopiedAllocator;
</span><span class="cx"> public:
</span><del>- static CopiedBlock* create(DeadBlock*);
- static CopiedBlock* createNoZeroFill(DeadBlock*);
</del><ins>+ static CopiedBlock* create(size_t);
+ static CopiedBlock* createNoZeroFill(size_t);
</ins><span class="cx">
</span><span class="cx"> void pin();
</span><span class="cx"> bool isPinned();
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> SpinLock& workListLock() { return m_workListLock; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- CopiedBlock(Region*);
</del><ins>+ CopiedBlock(size_t);
</ins><span class="cx"> void zeroFillWilderness(); // Can be called at any time to zero-fill to the end of the block.
</span><span class="cx">
</span><span class="cx"> void checkConsistency();
</span><span class="lines">@@ -94,6 +94,7 @@
</span><span class="cx"> SpinLock m_workListLock;
</span><span class="cx"> std::unique_ptr<CopyWorkList> m_workList;
</span><span class="cx">
</span><ins>+ size_t m_blockSize;
</ins><span class="cx"> size_t m_remaining;
</span><span class="cx"> bool m_isPinned : 1;
</span><span class="cx"> bool m_isOld : 1;
</span><span class="lines">@@ -103,15 +104,14 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline CopiedBlock* CopiedBlock::createNoZeroFill(DeadBlock* block)
</del><ins>+inline CopiedBlock* CopiedBlock::createNoZeroFill(size_t blockSize)
</ins><span class="cx"> {
</span><del>- Region* region = block->region();
- return new(NotNull, block) CopiedBlock(region);
</del><ins>+ return new(NotNull, fastAlignedMalloc(CopiedBlock::blockSize, blockSize)) CopiedBlock(blockSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline CopiedBlock* CopiedBlock::create(DeadBlock* block)
</del><ins>+inline CopiedBlock* CopiedBlock::create(size_t blockSize)
</ins><span class="cx"> {
</span><del>- CopiedBlock* newBlock = createNoZeroFill(block);
</del><ins>+ CopiedBlock* newBlock = createNoZeroFill(blockSize);
</ins><span class="cx"> newBlock->zeroFillWilderness();
</span><span class="cx"> return newBlock;
</span><span class="cx"> }
</span><span class="lines">@@ -128,8 +128,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline CopiedBlock::CopiedBlock(Region* region)
- : HeapBlock<CopiedBlock>(region)
</del><ins>+inline CopiedBlock::CopiedBlock(size_t blockSize)
+ : HeapBlock<CopiedBlock>()
+ , m_blockSize(blockSize)
</ins><span class="cx"> , m_remaining(payloadCapacity())
</span><span class="cx"> , m_isPinned(false)
</span><span class="cx"> , m_isOld(false)
</span><span class="lines">@@ -203,7 +204,7 @@
</span><span class="cx">
</span><span class="cx"> inline bool CopiedBlock::isOversize()
</span><span class="cx"> {
</span><del>- return region()->isCustomSize();
</del><ins>+ return m_blockSize != blockSize;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline unsigned CopiedBlock::liveBytes()
</span><span class="lines">@@ -219,7 +220,7 @@
</span><span class="cx">
</span><span class="cx"> inline char* CopiedBlock::payloadEnd()
</span><span class="cx"> {
</span><del>- return reinterpret_cast<char*>(this) + region()->blockSize();
</del><ins>+ return reinterpret_cast<char*>(this) + m_blockSize;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline size_t CopiedBlock::payloadCapacity()
</span><span class="lines">@@ -264,7 +265,7 @@
</span><span class="cx">
</span><span class="cx"> inline size_t CopiedBlock::capacity()
</span><span class="cx"> {
</span><del>- return region()->blockSize();
</del><ins>+ return m_blockSize;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool CopiedBlock::hasWorkList()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCopiedBlockInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CopiedBlockInlines.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CopiedBlockInlines.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/CopiedBlockInlines.h 2015-01-27 18:29:29 UTC (rev 179192)
</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="trunkSourceJavaScriptCoreheapCopiedSpacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CopiedSpace.cpp (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CopiedSpace.cpp 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/CopiedSpace.cpp 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -45,22 +45,22 @@
</span><span class="cx"> CopiedSpace::~CopiedSpace()
</span><span class="cx"> {
</span><span class="cx"> while (!m_oldGen.toSpace->isEmpty())
</span><del>- m_heap->blockAllocator().deallocate(CopiedBlock::destroy(m_oldGen.toSpace->removeHead()));
</del><ins>+ CopiedBlock::destroy(m_oldGen.toSpace->removeHead());
</ins><span class="cx">
</span><span class="cx"> while (!m_oldGen.fromSpace->isEmpty())
</span><del>- m_heap->blockAllocator().deallocate(CopiedBlock::destroy(m_oldGen.fromSpace->removeHead()));
</del><ins>+ CopiedBlock::destroy(m_oldGen.fromSpace->removeHead());
</ins><span class="cx">
</span><span class="cx"> while (!m_oldGen.oversizeBlocks.isEmpty())
</span><del>- m_heap->blockAllocator().deallocateCustomSize(CopiedBlock::destroy(m_oldGen.oversizeBlocks.removeHead()));
</del><ins>+ CopiedBlock::destroy(m_oldGen.oversizeBlocks.removeHead());
</ins><span class="cx">
</span><span class="cx"> while (!m_newGen.toSpace->isEmpty())
</span><del>- m_heap->blockAllocator().deallocate(CopiedBlock::destroy(m_newGen.toSpace->removeHead()));
</del><ins>+ CopiedBlock::destroy(m_newGen.toSpace->removeHead());
</ins><span class="cx">
</span><span class="cx"> while (!m_newGen.fromSpace->isEmpty())
</span><del>- m_heap->blockAllocator().deallocate(CopiedBlock::destroy(m_newGen.fromSpace->removeHead()));
</del><ins>+ CopiedBlock::destroy(m_newGen.fromSpace->removeHead());
</ins><span class="cx">
</span><span class="cx"> while (!m_newGen.oversizeBlocks.isEmpty())
</span><del>- m_heap->blockAllocator().deallocateCustomSize(CopiedBlock::destroy(m_newGen.oversizeBlocks.removeHead()));
</del><ins>+ CopiedBlock::destroy(m_newGen.oversizeBlocks.removeHead());
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_oldGen.toSpace->isEmpty());
</span><span class="cx"> ASSERT(m_oldGen.fromSpace->isEmpty());
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isOversize(bytes));
</span><span class="cx">
</span><del>- CopiedBlock* block = CopiedBlock::create(m_heap->blockAllocator().allocateCustomSize(sizeof(CopiedBlock) + bytes, CopiedBlock::blockSize));
</del><ins>+ CopiedBlock* block = CopiedBlock::create(sizeof(CopiedBlock) + bytes);
</ins><span class="cx"> m_newGen.oversizeBlocks.push(block);
</span><span class="cx"> m_newGen.blockFilter.add(reinterpret_cast<Bits>(block));
</span><span class="cx"> m_blockSet.add(block);
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> *outPtr = allocator.forceAllocate(bytes);
</span><span class="cx"> allocator.resetCurrentBlock();
</span><span class="cx">
</span><del>- m_heap->didAllocate(block->region()->blockSize());
</del><ins>+ m_heap->didAllocate(block->capacity());
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> else
</span><span class="cx"> m_newGen.oversizeBlocks.remove(oldBlock);
</span><span class="cx"> m_blockSet.remove(oldBlock);
</span><del>- m_heap->blockAllocator().deallocateCustomSize(CopiedBlock::destroy(oldBlock));
</del><ins>+ CopiedBlock::destroy(oldBlock);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> *ptr = newPtr;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCopiedSpaceInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CopiedSpaceInlines.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CopiedSpaceInlines.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/CopiedSpaceInlines.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -106,12 +106,12 @@
</span><span class="cx"> else
</span><span class="cx"> m_oldGen.fromSpace->remove(block);
</span><span class="cx"> }
</span><del>- m_heap->blockAllocator().deallocate(CopiedBlock::destroy(block));
</del><ins>+ CopiedBlock::destroy(block);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void CopiedSpace::recycleBorrowedBlock(CopiedBlock* block)
</span><span class="cx"> {
</span><del>- m_heap->blockAllocator().deallocate(CopiedBlock::destroy(block));
</del><ins>+ CopiedBlock::destroy(block);
</ins><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_loanedBlocksLock);
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> inline CopiedBlock* CopiedSpace::allocateBlockForCopyingPhase()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_inCopyingPhase);
</span><del>- CopiedBlock* block = CopiedBlock::createNoZeroFill(m_heap->blockAllocator().allocate<CopiedBlock>());
</del><ins>+ CopiedBlock* block = CopiedBlock::createNoZeroFill(CopiedBlock::blockSize);
</ins><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_loanedBlocksLock);
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> m_allocator.resetCurrentBlock();
</span><span class="cx">
</span><del>- CopiedBlock* block = CopiedBlock::create(m_heap->blockAllocator().allocate<CopiedBlock>());
</del><ins>+ CopiedBlock* block = CopiedBlock::create(CopiedBlock::blockSize);
</ins><span class="cx">
</span><span class="cx"> m_newGen.toSpace->push(block);
</span><span class="cx"> m_newGen.blockFilter.add(reinterpret_cast<Bits>(block));
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> oversizeBlocks->remove(block);
</span><span class="cx"> m_blockSet.remove(block);
</span><del>- m_heap->blockAllocator().deallocateCustomSize(CopiedBlock::destroy(block));
</del><ins>+ CopiedBlock::destroy(block);
</ins><span class="cx"> }
</span><span class="cx"> block = next;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCopyWorkListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CopyWorkList.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CopyWorkList.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/CopyWorkList.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define CopyWorkList_h
</span><span class="cx">
</span><span class="cx"> #include "CopyToken.h"
</span><ins>+#include "HeapBlock.h"
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -59,9 +60,9 @@
</span><span class="cx">
</span><span class="cx"> class CopyWorkListSegment : public HeapBlock<CopyWorkListSegment> {
</span><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, fastAlignedMalloc(blockSize, blockSize)) CopyWorkListSegment();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t size() { return m_size; }
</span><span class="lines">@@ -78,8 +79,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()
+ : HeapBlock<CopyWorkListSegment>()
</ins><span class="cx"> , m_size(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -143,7 +144,6 @@
</span><span class="cx"> public:
</span><span class="cx"> typedef CopyWorkListIterator iterator;
</span><span class="cx">
</span><del>- CopyWorkList(BlockAllocator&);
</del><span class="cx"> ~CopyWorkList();
</span><span class="cx">
</span><span class="cx"> void append(CopyWorklistItem);
</span><span class="lines">@@ -152,24 +152,18 @@
</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><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>
<a id="trunkSourceJavaScriptCoreheapGCSegmentedArrayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCSegmentedArray.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCSegmentedArray.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/GCSegmentedArray.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -31,21 +31,18 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-class BlockAllocator;
-class DeadBlock;
-
</del><span class="cx"> template <typename T>
</span><span class="cx"> class GCArraySegment : public HeapBlock<GCArraySegment<T>> {
</span><span class="cx"> public:
</span><del>- GCArraySegment(Region* region)
- : HeapBlock<GCArraySegment>(region)
</del><ins>+ GCArraySegment()
+ : HeapBlock<GCArraySegment>()
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> , m_top(0)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static GCArraySegment* create(DeadBlock*);
</del><ins>+ static GCArraySegment* create();
</ins><span class="cx">
</span><span class="cx"> T* data()
</span><span class="cx"> {
</span><span class="lines">@@ -66,7 +63,7 @@
</span><span class="cx"> friend class GCSegmentedArrayIterator<T>;
</span><span class="cx"> friend class GCSegmentedArrayIterator<const T>;
</span><span class="cx"> public:
</span><del>- GCSegmentedArray(BlockAllocator&);
</del><ins>+ GCSegmentedArray();
</ins><span class="cx"> ~GCSegmentedArray();
</span><span class="cx">
</span><span class="cx"> void append(T);
</span><span class="lines">@@ -101,7 +98,6 @@
</span><span class="cx"> void validatePrevious();
</span><span class="cx">
</span><span class="cx"> DoublyLinkedList<GCArraySegment<T>> m_segments;
</span><del>- BlockAllocator& m_blockAllocator;
</del><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE static const size_t s_segmentCapacity = CapacityFromSize<GCArraySegment<T>::blockSize>::value;
</span><span class="cx"> size_t m_top;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCSegmentedArrayInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCSegmentedArrayInlines.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCSegmentedArrayInlines.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/GCSegmentedArrayInlines.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -26,18 +26,16 @@
</span><span class="cx"> #ifndef GCSegmentedArrayInlines_h
</span><span class="cx"> #define GCSegmentedArrayInlines_h
</span><span class="cx">
</span><del>-#include "BlockAllocator.h"
</del><span class="cx"> #include "GCSegmentedArray.h"
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> template <typename T>
</span><del>-GCSegmentedArray<T>::GCSegmentedArray(BlockAllocator& blockAllocator)
- : m_blockAllocator(blockAllocator)
- , m_top(0)
</del><ins>+GCSegmentedArray<T>::GCSegmentedArray()
+ : m_top(0)
</ins><span class="cx"> , m_numberOfSegments(0)
</span><span class="cx"> {
</span><del>- m_segments.push(GCArraySegment<T>::create(m_blockAllocator.allocate<GCArraySegment<T>>()));
</del><ins>+ m_segments.push(GCArraySegment<T>::create());
</ins><span class="cx"> m_numberOfSegments++;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -46,7 +44,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_numberOfSegments == 1);
</span><span class="cx"> ASSERT(m_segments.size() == 1);
</span><del>- m_blockAllocator.deallocate(GCArraySegment<T>::destroy(m_segments.removeHead()));
</del><ins>+ GCArraySegment<T>::destroy(m_segments.removeHead());
</ins><span class="cx"> m_numberOfSegments--;
</span><span class="cx"> ASSERT(!m_numberOfSegments);
</span><span class="cx"> ASSERT(!m_segments.size());
</span><span class="lines">@@ -61,7 +59,7 @@
</span><span class="cx"> for (GCArraySegment<T>* current = m_segments.head(); current->next(); current = next) {
</span><span class="cx"> next = current->next();
</span><span class="cx"> m_segments.remove(current);
</span><del>- m_blockAllocator.deallocate(GCArraySegment<T>::destroy(current));
</del><ins>+ GCArraySegment<T>::destroy(current);
</ins><span class="cx"> }
</span><span class="cx"> m_top = 0;
</span><span class="cx"> m_numberOfSegments = 1;
</span><span class="lines">@@ -75,7 +73,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_segments.head()->m_top == s_segmentCapacity);
</span><span class="cx">
</span><del>- GCArraySegment<T>* nextSegment = GCArraySegment<T>::create(m_blockAllocator.allocate<GCArraySegment<T>>());
</del><ins>+ GCArraySegment<T>* nextSegment = GCArraySegment<T>::create();
</ins><span class="cx"> m_numberOfSegments++;
</span><span class="cx">
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="lines">@@ -93,7 +91,7 @@
</span><span class="cx"> validatePrevious();
</span><span class="cx"> if (top())
</span><span class="cx"> return true;
</span><del>- m_blockAllocator.deallocate(GCArraySegment<T>::destroy(m_segments.removeHead()));
</del><ins>+ GCArraySegment<T>::destroy(m_segments.removeHead());
</ins><span class="cx"> ASSERT(m_numberOfSegments > 1);
</span><span class="cx"> m_numberOfSegments--;
</span><span class="cx"> setTopForFullSegment();
</span><span class="lines">@@ -127,9 +125,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename T>
</span><del>-inline GCArraySegment<T>* GCArraySegment<T>::create(DeadBlock* block)
</del><ins>+inline GCArraySegment<T>* GCArraySegment<T>::create()
</ins><span class="cx"> {
</span><del>- return new (NotNull, block) GCArraySegment<T>(block->region());
</del><ins>+ return new (NotNull, fastAlignedMalloc(blockSize, blockSize)) GCArraySegment<T>();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename T>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCThreadSharedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCThreadSharedData.cpp (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCThreadSharedData.cpp 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/GCThreadSharedData.cpp 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> : m_vm(vm)
</span><span class="cx"> , m_copiedSpace(&vm->heap.m_storageSpace)
</span><span class="cx"> , m_shouldHashCons(false)
</span><del>- , m_sharedMarkStack(vm->heap.blockAllocator())
</del><ins>+ , m_sharedMarkStack()
</ins><span class="cx"> , m_numberOfActiveParallelMarkers(0)
</span><span class="cx"> , m_parallelMarkersShouldExit(false)
</span><span class="cx"> , m_copyIndex(0)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCThreadSharedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCThreadSharedData.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCThreadSharedData.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/GCThreadSharedData.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx">
</span><span class="cx"> class GCThread;
</span><span class="cx"> class VM;
</span><ins>+class CopiedBlock;
</ins><span class="cx"> class CopiedSpace;
</span><span class="cx"> class CopyVisitor;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHandleBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HandleBlock.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HandleBlock.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/HandleBlock.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -30,13 +30,12 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-class DeadBlock;
</del><span class="cx"> class HandleSet;
</span><span class="cx"> class HandleNode;
</span><span class="cx">
</span><span class="cx"> class HandleBlock : public HeapBlock<HandleBlock> {
</span><span class="cx"> public:
</span><del>- static HandleBlock* create(DeadBlock*, HandleSet*);
</del><ins>+ static HandleBlock* create(HandleSet*);
</ins><span class="cx"> static HandleBlock* blockFor(HandleNode*);
</span><span class="cx">
</span><span class="cx"> static const size_t blockSize = 4 * KB;
</span><span class="lines">@@ -48,7 +47,7 @@
</span><span class="cx"> unsigned nodeCapacity();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- HandleBlock(Region*, HandleSet*);
</del><ins>+ HandleBlock(HandleSet*);
</ins><span class="cx">
</span><span class="cx"> char* payload();
</span><span class="cx"> char* payloadEnd();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHandleBlockInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HandleBlockInlines.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HandleBlockInlines.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/HandleBlockInlines.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -26,26 +26,24 @@
</span><span class="cx"> #ifndef HandleBlockInlines_h
</span><span class="cx"> #define HandleBlockInlines_h
</span><span class="cx">
</span><del>-#include "BlockAllocator.h"
</del><span class="cx"> #include "HandleBlock.h"
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-inline HandleBlock* HandleBlock::create(DeadBlock* block, HandleSet* handleSet)
</del><ins>+inline HandleBlock* HandleBlock::create(HandleSet* handleSet)
</ins><span class="cx"> {
</span><del>- Region* region = block->region();
- return new (NotNull, block) HandleBlock(region, handleSet);
</del><ins>+ return new (NotNull, fastAlignedMalloc(blockSize, blockSize)) HandleBlock(handleSet);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline HandleBlock::HandleBlock(Region* region, HandleSet* handleSet)
- : HeapBlock<HandleBlock>(region)
</del><ins>+inline HandleBlock::HandleBlock(HandleSet* handleSet)
+ : HeapBlock<HandleBlock>()
</ins><span class="cx"> , m_handleSet(handleSet)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline char* HandleBlock::payloadEnd()
</span><span class="cx"> {
</span><del>- return reinterpret_cast<char*>(this) + region()->blockSize();
</del><ins>+ return reinterpret_cast<char*>(this) + blockSize;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline char* HandleBlock::payload()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHandleSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HandleSet.cpp (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HandleSet.cpp 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/HandleSet.cpp 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -44,12 +44,12 @@
</span><span class="cx"> HandleSet::~HandleSet()
</span><span class="cx"> {
</span><span class="cx"> while (!m_blockList.isEmpty())
</span><del>- m_vm->heap.blockAllocator().deallocate(HandleBlock::destroy(m_blockList.removeHead()));
</del><ins>+ HandleBlock::destroy(m_blockList.removeHead());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HandleSet::grow()
</span><span class="cx"> {
</span><del>- HandleBlock* newBlock = HandleBlock::create(m_vm->heap.blockAllocator().allocate<HandleBlock>(), this);
</del><ins>+ HandleBlock* newBlock = HandleBlock::create(this);
</ins><span class="cx"> m_blockList.append(newBlock);
</span><span class="cx">
</span><span class="cx"> for (int i = newBlock->nodeCapacity() - 1; i >= 0; --i) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -308,7 +308,6 @@
</span><span class="cx"> , m_totalBytesVisited(0)
</span><span class="cx"> , m_totalBytesCopied(0)
</span><span class="cx"> , m_operationInProgress(NoOperation)
</span><del>- , m_blockAllocator()
</del><span class="cx"> , m_objectSpace(this)
</span><span class="cx"> , m_storageSpace(this)
</span><span class="cx"> , m_extraMemoryUsage(0)
</span><span class="lines">@@ -317,7 +316,7 @@
</span><span class="cx"> , m_slotVisitor(m_sharedData)
</span><span class="cx"> , m_copyVisitor(m_sharedData)
</span><span class="cx"> , m_handleSet(vm)
</span><del>- , m_codeBlocks(m_blockAllocator)
</del><ins>+ , m_codeBlocks()
</ins><span class="cx"> , m_isSafeToCollect(false)
</span><span class="cx"> , m_writeBarrierBuffer(256)
</span><span class="cx"> , m_vm(vm)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/Heap.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> #define Heap_h
</span><span class="cx">
</span><span class="cx"> #include "ArrayBuffer.h"
</span><del>-#include "BlockAllocator.h"
</del><span class="cx"> #include "CodeBlockSet.h"
</span><span class="cx"> #include "CopyVisitor.h"
</span><span class="cx"> #include "GCIncomingRefCountedSet.h"
</span><span class="lines">@@ -215,7 +214,6 @@
</span><span class="cx">
</span><span class="cx"> bool isDeferred() const { return !!m_deferralDepth || Options::disableGC(); }
</span><span class="cx">
</span><del>- BlockAllocator& blockAllocator();
</del><span class="cx"> StructureIDTable& structureIDTable() { return m_structureIDTable; }
</span><span class="cx">
</span><span class="cx"> #if USE(CF)
</span><span class="lines">@@ -245,7 +243,6 @@
</span><span class="cx"> friend class CopyVisitor;
</span><span class="cx"> friend class RecursiveAllocationScope;
</span><span class="cx"> friend class SlotVisitor;
</span><del>- friend class SuperRegion;
</del><span class="cx"> friend class IncrementalSweeper;
</span><span class="cx"> friend class HeapStatistics;
</span><span class="cx"> friend class VM;
</span><span class="lines">@@ -342,7 +339,6 @@
</span><span class="cx"> size_t m_totalBytesCopied;
</span><span class="cx">
</span><span class="cx"> HeapOperation m_operationInProgress;
</span><del>- BlockAllocator m_blockAllocator;
</del><span class="cx"> StructureIDTable m_structureIDTable;
</span><span class="cx"> MarkedSpace m_objectSpace;
</span><span class="cx"> CopiedSpace m_storageSpace;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HeapBlock.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HeapBlock.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/HeapBlock.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -27,37 +27,31 @@
</span><span class="cx"> #define HeapBlock_h
</span><span class="cx">
</span><span class="cx"> #include <wtf/DoublyLinkedList.h>
</span><ins>+#include <wtf/FastMalloc.h>
</ins><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> enum AllocationEffort { AllocationCanFail, AllocationMustSucceed };
</span><span class="cx">
</span><del>-class Region;
-
</del><span class="cx"> template<typename T>
</span><span class="cx"> class HeapBlock : public DoublyLinkedListNode<T> {
</span><span class="cx"> friend class WTF::DoublyLinkedListNode<T>;
</span><span class="cx"> public:
</span><del>- static HeapBlock* destroy(HeapBlock* block) WARN_UNUSED_RETURN
</del><ins>+ static void destroy(HeapBlock* block)
</ins><span class="cx"> {
</span><span class="cx"> static_cast<T*>(block)->~T();
</span><del>- return block;
</del><ins>+ fastAlignedFree(block);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- HeapBlock(Region* region)
</del><ins>+ HeapBlock()
</ins><span class="cx"> : DoublyLinkedListNode<T>()
</span><del>- , m_region(region)
</del><span class="cx"> , m_prev(0)
</span><span class="cx"> , m_next(0)
</span><span class="cx"> {
</span><del>- ASSERT(m_region);
</del><span class="cx"> }
</span><span class="cx">
</span><del>- Region* region() const { return m_region; }
-
</del><span class="cx"> private:
</span><del>- Region* m_region;
</del><span class="cx"> T* m_prev;
</span><span class="cx"> T* m_next;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HeapInlines.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HeapInlines.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/HeapInlines.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -240,11 +240,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline BlockAllocator& Heap::blockAllocator()
-{
- return m_blockAllocator;
-}
-
</del><span class="cx"> #if USE(CF)
</span><span class="cx"> template <typename T>
</span><span class="cx"> inline void Heap::releaseSoon(RetainPtr<T>&& object)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HeapTimer.cpp (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HeapTimer.cpp 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/HeapTimer.cpp 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "HeapTimer.h"
</span><span class="cx">
</span><ins>+#include "GCActivityCallback.h"
</ins><span class="cx"> #include "IncrementalSweeper.h"
</span><span class="cx"> #include "JSObject.h"
</span><span class="cx"> #include "JSString.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkStackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkStack.cpp (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkStack.cpp 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/MarkStack.cpp 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-MarkStackArray::MarkStackArray(BlockAllocator& blockAllocator)
- : GCSegmentedArray<const JSCell*>(blockAllocator)
</del><ins>+MarkStackArray::MarkStackArray()
+ : GCSegmentedArray<const JSCell*>()
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkStackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkStack.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkStack.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/MarkStack.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> class MarkStackArray : public GCSegmentedArray<const JSCell*> {
</span><span class="cx"> public:
</span><del>- MarkStackArray(BlockAllocator&);
</del><ins>+ MarkStackArray();
</ins><span class="cx">
</span><span class="cx"> void donateSomeCellsTo(MarkStackArray& other);
</span><span class="cx"> void stealSomeCellsFrom(MarkStackArray& other, size_t idleThreadCount);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedAllocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -198,9 +198,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 (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -34,21 +34,20 @@
</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 blockSize, 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(MarkedBlock::blockSize, blockSize)) MarkedBlock(allocator, blockSize, 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>+MarkedBlock::MarkedBlock(MarkedAllocator* allocator, size_t blockSize, size_t cellSize, DestructorType destructorType)
+ : HeapBlock<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 : blockSize / atomSize) - m_atomsPerCell + 1)
</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 class="cx"> , m_weakSet(allocator->heap()->vm())
</span><ins>+ , m_blockSize(blockSize)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(allocator);
</span><span class="cx"> HEAP_LOG_BLOCK_STATE_TRANSITION(this);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedBlock.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedBlock.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/MarkedBlock.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -22,9 +22,7 @@
</span><span class="cx"> #ifndef MarkedBlock_h
</span><span class="cx"> #define MarkedBlock_h
</span><span class="cx">
</span><del>-#include "BlockAllocator.h"
</del><span class="cx"> #include "HeapBlock.h"
</span><del>-
</del><span class="cx"> #include "HeapOperation.h"
</span><span class="cx"> #include "WeakSet.h"
</span><span class="cx"> #include <wtf/Bitmap.h>
</span><span class="lines">@@ -113,7 +111,7 @@
</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 blockSize, size_t cellSize, DestructorType);
</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,7 +192,7 @@
</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 blockSize, 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="lines">@@ -215,6 +213,7 @@
</span><span class="cx"> MarkedAllocator* m_allocator;
</span><span class="cx"> BlockState m_state;
</span><span class="cx"> WeakSet m_weakSet;
</span><ins>+ size_t m_blockSize;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline MarkedBlock::FreeList::FreeList()
</span><span class="lines">@@ -333,7 +332,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_blockSize;
</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 (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -251,11 +251,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>
<a id="trunkSourceJavaScriptCoreheapMarkedSpaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedSpace.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedSpace.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/MarkedSpace.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include <wtf/DoublyLinkedList.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><ins>+#include <wtf/RetainPtr.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapRegionh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/heap/Region.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Region.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/Region.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -1,321 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef JSC_Region_h
-#define JSC_Region_h
-
-#include "HeapBlock.h"
-#include "SuperRegion.h"
-#include <wtf/DoublyLinkedList.h>
-#include <wtf/MetaAllocatorHandle.h>
-#include <wtf/PageAllocationAligned.h>
-
-#define HEAP_MEMORY_ID reinterpret_cast<void*>(static_cast<intptr_t>(-3))
-
-#define ENABLE_SUPER_REGION 0
-
-#ifndef ENABLE_SUPER_REGION
-#if USE(JSVALUE64) && !CPU(ARM64)
-#define ENABLE_SUPER_REGION 1
-#else
-#define ENABLE_SUPER_REGION 0
-#endif
-#endif
-
-namespace JSC {
-
-class DeadBlock : public HeapBlock<DeadBlock> {
-public:
- DeadBlock(Region*);
-};
-
-inline DeadBlock::DeadBlock(Region* region)
- : HeapBlock<DeadBlock>(region)
-{
-}
-
-class Region : public DoublyLinkedListNode<Region> {
- WTF_MAKE_FAST_ALLOCATED;
-
- friend class WTF::DoublyLinkedListNode<Region>;
- friend class BlockAllocator;
-public:
- ~Region();
- static Region* create(SuperRegion*, size_t blockSize);
- static Region* createCustomSize(SuperRegion*, size_t blockSize, size_t blockAlignment);
- Region* reset(size_t blockSize);
- void destroy();
-
- size_t blockSize() const { return m_blockSize; }
- bool isFull() const { return m_blocksInUse == m_totalBlocks; }
- bool isEmpty() const { return !m_blocksInUse; }
- bool isCustomSize() const { return m_isCustomSize; }
-
- DeadBlock* allocate();
- void deallocate(void*);
-
- static const size_t s_regionSize = 64 * KB;
- static const size_t s_regionMask = ~(s_regionSize - 1);
-
-protected:
- Region(size_t blockSize, size_t totalBlocks, bool isExcess);
- void initializeBlockList();
-
- bool m_isExcess;
-
-private:
- void* base();
- size_t size();
-
- size_t m_totalBlocks;
- size_t m_blocksInUse;
- size_t m_blockSize;
- bool m_isCustomSize;
- Region* m_prev;
- Region* m_next;
- DoublyLinkedList<DeadBlock> m_deadBlocks;
-};
-
-
-class NormalRegion : public Region {
- friend class Region;
-private:
- NormalRegion(PassRefPtr<WTF::MetaAllocatorHandle>, size_t blockSize, size_t totalBlocks);
-
- static NormalRegion* tryCreate(SuperRegion*, size_t blockSize);
- static NormalRegion* tryCreateCustomSize(SuperRegion*, size_t blockSize, size_t blockAlignment);
-
- void* base() { return m_allocation->start(); }
- size_t size() { return m_allocation->sizeInBytes(); }
-
- NormalRegion* reset(size_t blockSize);
-
- RefPtr<WTF::MetaAllocatorHandle> m_allocation;
-};
-
-class ExcessRegion : public Region {
- friend class Region;
-private:
- ExcessRegion(PageAllocationAligned&, size_t blockSize, size_t totalBlocks);
-
- ~ExcessRegion();
-
- static ExcessRegion* create(size_t blockSize);
- static ExcessRegion* createCustomSize(size_t blockSize, size_t blockAlignment);
-
- void* base() { return m_allocation.base(); }
- size_t size() { return m_allocation.size(); }
-
- ExcessRegion* reset(size_t blockSize);
-
- PageAllocationAligned m_allocation;
-};
-
-inline NormalRegion::NormalRegion(PassRefPtr<WTF::MetaAllocatorHandle> allocation, size_t blockSize, size_t totalBlocks)
- : Region(blockSize, totalBlocks, false)
- , m_allocation(allocation)
-{
- initializeBlockList();
-}
-
-inline NormalRegion* NormalRegion::tryCreate(SuperRegion* superRegion, size_t blockSize)
-{
- RefPtr<WTF::MetaAllocatorHandle> allocation = superRegion->allocate(s_regionSize, HEAP_MEMORY_ID);
- if (!allocation)
- return 0;
- return new NormalRegion(allocation, blockSize, s_regionSize / blockSize);
-}
-
-inline NormalRegion* NormalRegion::tryCreateCustomSize(SuperRegion* superRegion, size_t blockSize, size_t blockAlignment)
-{
- ASSERT_UNUSED(blockAlignment, blockAlignment <= s_regionSize);
- RefPtr<WTF::MetaAllocatorHandle> allocation = superRegion->allocate(blockSize, HEAP_MEMORY_ID);
- if (!allocation)
- return 0;
- return new NormalRegion(allocation, blockSize, 1);
-}
-
-inline NormalRegion* NormalRegion::reset(size_t blockSize)
-{
- ASSERT(!m_isExcess);
- RefPtr<WTF::MetaAllocatorHandle> allocation = m_allocation.release();
- return new (NotNull, this) NormalRegion(allocation.release(), blockSize, s_regionSize / blockSize);
-}
-
-inline ExcessRegion::ExcessRegion(PageAllocationAligned& allocation, size_t blockSize, size_t totalBlocks)
- : Region(blockSize, totalBlocks, true)
- , m_allocation(allocation)
-{
- initializeBlockList();
-}
-
-inline ExcessRegion::~ExcessRegion()
-{
- m_allocation.deallocate();
-}
-
-inline ExcessRegion* ExcessRegion::create(size_t blockSize)
-{
- PageAllocationAligned allocation = PageAllocationAligned::allocate(s_regionSize, s_regionSize, OSAllocator::JSGCHeapPages);
- ASSERT(static_cast<bool>(allocation));
- return new ExcessRegion(allocation, blockSize, s_regionSize / blockSize);
-}
-
-inline ExcessRegion* ExcessRegion::createCustomSize(size_t blockSize, size_t blockAlignment)
-{
- PageAllocationAligned allocation = PageAllocationAligned::allocate(blockSize, blockAlignment, OSAllocator::JSGCHeapPages);
- ASSERT(static_cast<bool>(allocation));
- return new ExcessRegion(allocation, blockSize, 1);
-}
-
-inline ExcessRegion* ExcessRegion::reset(size_t blockSize)
-{
- ASSERT(m_isExcess);
- PageAllocationAligned allocation = m_allocation;
- return new (NotNull, this) ExcessRegion(allocation, blockSize, s_regionSize / blockSize);
-}
-
-inline Region::Region(size_t blockSize, size_t totalBlocks, bool isExcess)
- : DoublyLinkedListNode<Region>()
- , m_isExcess(isExcess)
- , m_totalBlocks(totalBlocks)
- , m_blocksInUse(0)
- , m_blockSize(blockSize)
- , m_isCustomSize(false)
- , m_prev(0)
- , m_next(0)
-{
-}
-
-inline void Region::initializeBlockList()
-{
- char* start = static_cast<char*>(base());
- char* current = start;
- for (size_t i = 0; i < m_totalBlocks; i++) {
- ASSERT(current < start + size());
- m_deadBlocks.append(new (NotNull, current) DeadBlock(this));
- current += m_blockSize;
- }
-}
-
-inline Region* Region::create(SuperRegion* superRegion, size_t blockSize)
-{
-#if ENABLE(SUPER_REGION)
- ASSERT(blockSize <= s_regionSize);
- ASSERT(!(s_regionSize % blockSize));
- Region* region = NormalRegion::tryCreate(superRegion, blockSize);
- if (LIKELY(!!region))
- return region;
-#else
- UNUSED_PARAM(superRegion);
-#endif
- return ExcessRegion::create(blockSize);
-}
-
-inline Region* Region::createCustomSize(SuperRegion* superRegion, size_t blockSize, size_t blockAlignment)
-{
-#if ENABLE(SUPER_REGION)
- Region* region = NormalRegion::tryCreateCustomSize(superRegion, blockSize, blockAlignment);
- if (UNLIKELY(!region))
- region = ExcessRegion::createCustomSize(blockSize, blockAlignment);
-#else
- UNUSED_PARAM(superRegion);
- Region* region = ExcessRegion::createCustomSize(blockSize, blockAlignment);
-#endif
- region->m_isCustomSize = true;
- return region;
-}
-
-inline Region::~Region()
-{
- ASSERT(isEmpty());
-}
-
-inline void Region::destroy()
-{
-#if ENABLE(SUPER_REGION)
- if (UNLIKELY(m_isExcess))
- delete static_cast<ExcessRegion*>(this);
- else
- delete static_cast<NormalRegion*>(this);
-#else
- delete static_cast<ExcessRegion*>(this);
-#endif
-}
-
-inline Region* Region::reset(size_t blockSize)
-{
-#if ENABLE(SUPER_REGION)
- ASSERT(isEmpty());
- if (UNLIKELY(m_isExcess))
- return static_cast<ExcessRegion*>(this)->reset(blockSize);
- return static_cast<NormalRegion*>(this)->reset(blockSize);
-#else
- return static_cast<ExcessRegion*>(this)->reset(blockSize);
-#endif
-}
-
-inline DeadBlock* Region::allocate()
-{
- ASSERT(!isFull());
- m_blocksInUse++;
- return m_deadBlocks.removeHead();
-}
-
-inline void Region::deallocate(void* base)
-{
- ASSERT(base);
- ASSERT(m_blocksInUse);
- ASSERT(base >= this->base() && base < static_cast<char*>(this->base()) + size());
- DeadBlock* block = new (NotNull, base) DeadBlock(this);
- m_deadBlocks.push(block);
- m_blocksInUse--;
-}
-
-inline void* Region::base()
-{
-#if ENABLE(SUPER_REGION)
- if (UNLIKELY(m_isExcess))
- return static_cast<ExcessRegion*>(this)->ExcessRegion::base();
- return static_cast<NormalRegion*>(this)->NormalRegion::base();
-#else
- return static_cast<ExcessRegion*>(this)->ExcessRegion::base();
-#endif
-}
-
-inline size_t Region::size()
-{
-#if ENABLE(SUPER_REGION)
- if (UNLIKELY(m_isExcess))
- return static_cast<ExcessRegion*>(this)->ExcessRegion::size();
- return static_cast<NormalRegion*>(this)->NormalRegion::size();
-#else
- return static_cast<ExcessRegion*>(this)->ExcessRegion::size();
-#endif
-}
-
-} // namespace JSC
-
-#endif // JSC_Region_h
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapSlotVisitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> SlotVisitor::SlotVisitor(GCThreadSharedData& shared)
</span><del>- : m_stack(shared.m_vm->heap.blockAllocator())
</del><ins>+ : m_stack()
</ins><span class="cx"> , m_bytesVisited(0)
</span><span class="cx"> , m_bytesCopied(0)
</span><span class="cx"> , m_visitCount(0)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapSuperRegioncpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/heap/SuperRegion.cpp (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/SuperRegion.cpp 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/SuperRegion.cpp 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -1,83 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "SuperRegion.h"
-
-#include "JSCInlines.h"
-#include "Region.h"
-
-namespace JSC {
-
-const uint64_t SuperRegion::s_fixedHeapMemoryPoolSize = 4 * 1024 * static_cast<uint64_t>(MB);
-
-SuperRegion::SuperRegion()
- : MetaAllocator(Region::s_regionSize, Region::s_regionSize)
- , m_reservationBase(0)
-{
-#if ENABLE(SUPER_REGION)
- // Over-allocate so that we can make sure that we're aligned to the size of Regions.
- m_reservation = PageReservation::reserve(s_fixedHeapMemoryPoolSize + Region::s_regionSize, OSAllocator::JSGCHeapPages);
- m_reservationBase = getAlignedBase(m_reservation);
- addFreshFreeSpace(m_reservationBase, s_fixedHeapMemoryPoolSize);
-#else
- UNUSED_PARAM(m_reservation);
- UNUSED_PARAM(m_reservationBase);
-#endif
-}
-
-SuperRegion::~SuperRegion()
-{
-#if ENABLE(SUPER_REGION)
- m_reservation.deallocate();
-#endif
-}
-
-void* SuperRegion::getAlignedBase(PageReservation& reservation)
-{
- for (char* current = static_cast<char*>(reservation.base()); current < static_cast<char*>(reservation.base()) + Region::s_regionSize; current += pageSize()) {
- if (!(reinterpret_cast<size_t>(current) & ~Region::s_regionMask))
- return current;
- }
- ASSERT_NOT_REACHED();
- return 0;
-}
-
-void* SuperRegion::allocateNewSpace(size_t&)
-{
- return 0;
-}
-
-void SuperRegion::notifyNeedPage(void* page)
-{
- m_reservation.commit(page, Region::s_regionSize);
-}
-
-void SuperRegion::notifyPageIsFree(void* page)
-{
- m_reservation.decommit(page, Region::s_regionSize);
-}
-
-} // namespace JSC
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapSuperRegionh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/heap/SuperRegion.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/SuperRegion.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/SuperRegion.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SuperRegion_h
-#define SuperRegion_h
-
-#include <wtf/MetaAllocator.h>
-#include <wtf/PageBlock.h>
-#include <wtf/PageReservation.h>
-
-namespace JSC {
-
-class VM;
-
-class SuperRegion : public WTF::MetaAllocator {
-public:
- SuperRegion();
- virtual ~SuperRegion();
-
-protected:
- virtual void* allocateNewSpace(size_t&) override;
- virtual void notifyNeedPage(void*) override;
- virtual void notifyPageIsFree(void*) override;
-
-private:
- static const uint64_t s_fixedHeapMemoryPoolSize;
-
- static void* getAlignedBase(PageReservation&);
-
- PageReservation m_reservation;
- void* m_reservationBase;
-};
-
-} // namespace JSC
-
-#endif // SuperRegion_h
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapWeakBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/WeakBlock.cpp (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/WeakBlock.cpp 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/WeakBlock.cpp 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -34,14 +34,13 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-WeakBlock* WeakBlock::create(DeadBlock* block)
</del><ins>+WeakBlock* WeakBlock::create()
</ins><span class="cx"> {
</span><del>- Region* region = block->region();
- return new (NotNull, block) WeakBlock(region);
</del><ins>+ return new (NotNull, fastAlignedMalloc(blockSize, blockSize)) WeakBlock();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-WeakBlock::WeakBlock(Region* region)
- : HeapBlock<WeakBlock>(region)
</del><ins>+WeakBlock::WeakBlock()
+ : HeapBlock<WeakBlock>()
</ins><span class="cx"> {
</span><span class="cx"> for (size_t i = 0; i < weakImplCount(); ++i) {
</span><span class="cx"> WeakImpl* weakImpl = &weakImpls()[i];
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapWeakBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/WeakBlock.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/WeakBlock.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/WeakBlock.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-class DeadBlock;
</del><span class="cx"> class HeapRootVisitor;
</span><span class="cx"> class JSValue;
</span><span class="cx"> class WeakHandleOwner;
</span><span class="lines">@@ -56,7 +55,7 @@
</span><span class="cx"> FreeCell* freeList;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static WeakBlock* create(DeadBlock*);
</del><ins>+ static WeakBlock* create();
</ins><span class="cx">
</span><span class="cx"> static WeakImpl* asWeakImpl(FreeCell*);
</span><span class="cx">
</span><span class="lines">@@ -73,7 +72,7 @@
</span><span class="cx"> private:
</span><span class="cx"> static FreeCell* asFreeCell(WeakImpl*);
</span><span class="cx">
</span><del>- WeakBlock(Region*);
</del><ins>+ WeakBlock();
</ins><span class="cx"> WeakImpl* firstWeakImpl();
</span><span class="cx"> void finalize(WeakImpl*);
</span><span class="cx"> WeakImpl* weakImpls();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapWeakSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/WeakSet.cpp (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/WeakSet.cpp 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/JavaScriptCore/heap/WeakSet.cpp 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> WeakBlock* next = 0;
</span><span class="cx"> for (WeakBlock* block = m_blocks.head(); block; block = next) {
</span><span class="cx"> next = block->next();
</span><del>- heap()->blockAllocator().deallocate(WeakBlock::destroy(block));
</del><ins>+ WeakBlock::destroy(block);
</ins><span class="cx"> }
</span><span class="cx"> m_blocks.clear();
</span><span class="cx"> }
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> WeakBlock::FreeCell* WeakSet::addAllocator()
</span><span class="cx"> {
</span><del>- WeakBlock* block = WeakBlock::create(heap()->blockAllocator().allocate<WeakBlock>());
</del><ins>+ WeakBlock* block = WeakBlock::create();
</ins><span class="cx"> heap()->didAllocate(WeakBlock::blockSize);
</span><span class="cx"> m_blocks.append(block);
</span><span class="cx"> WeakBlock::SweepResult sweepResult = block->takeSweepResult();
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> void WeakSet::removeAllocator(WeakBlock* block)
</span><span class="cx"> {
</span><span class="cx"> m_blocks.remove(block);
</span><del>- heap()->blockAllocator().deallocate(WeakBlock::destroy(block));
</del><ins>+ WeakBlock::destroy(block);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/WTF/ChangeLog 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-01-26 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.
+
+ New interface for aligned allocation: fastAlignedMalloc / fastAlignedFree.
+ We require a special function call on free because Windows.
+
+ * wtf/FastMalloc.cpp:
+ (WTF::fastAlignedMalloc):
+ (WTF::fastAlignedFree): Do it.
+
+ (WTF::do_memalign): Un-ifdef this, since we use it now.
+
+ * wtf/FastMalloc.h: Make our new function names visible like the rest
+ of fastMalloc.
+
</ins><span class="cx"> 2015-01-26 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] ASSERTION FAILED !m_ptr under AccessibilityController::winAddNotificationListener
</span></span></pre></div>
<a id="trunkSourceWTFwtfFastMalloccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FastMalloc.cpp 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -244,6 +244,34 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if OS(WINDOWS)
+
+void* fastAlignedMalloc(size_t alignment, size_t size)
+{
+ return _aligned_malloc(alignment, size);
+}
+
+void fastAlignedFree(void* p)
+{
+ _aligned_free(p);
+}
+
+#else
+
+void* fastAlignedMalloc(size_t alignment, size_t size)
+{
+ void* p = nullptr;
+ posix_memalign(&p, alignment, size);
+ return p;
+}
+
+void fastAlignedFree(void* p)
+{
+ free(p);
+}
+
+#endif // OS(WINDOWS)
+
</ins><span class="cx"> TryMallocReturnValue tryFastMalloc(size_t n)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isForbidden());
</span><span class="lines">@@ -454,6 +482,16 @@
</span><span class="cx"> return size;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void* fastAlignedMalloc(size_t alignment, size_t size)
+{
+ return bmalloc::api::memalign(alignment, size);
+}
+
+void fastAlignedFree(void* p)
+{
+ bmalloc::api::free(p);
+}
+
</ins><span class="cx"> TryMallocReturnValue tryFastMalloc(size_t size)
</span><span class="cx"> {
</span><span class="cx"> return fastMalloc(size);
</span><span class="lines">@@ -4204,7 +4242,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifndef WTF_CHANGES
</del><span class="cx"> // For use by exported routines below that want specific alignments
</span><span class="cx"> //
</span><span class="cx"> // Note: this code can be slow, and can significantly fragment memory.
</span><span class="lines">@@ -4275,7 +4312,6 @@
</span><span class="cx"> }
</span><span class="cx"> return SpanToMallocResult(span);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Helpers for use by exported routines below:
</span><span class="cx">
</span><span class="lines">@@ -4332,6 +4368,16 @@
</span><span class="cx"> template <bool crashOnFailure>
</span><span class="cx"> ALWAYS_INLINE void* malloc(size_t);
</span><span class="cx">
</span><ins>+void* fastAlignedMalloc(size_t alignment, size_t size)
+{
+ return do_memalign(alignment, size);
+}
+
+void fastAlignedFree(void* p)
+{
+ do_free(p);
+}
+
</ins><span class="cx"> void* fastMalloc(size_t size)
</span><span class="cx"> {
</span><span class="cx"> void* result = malloc<true>(size);
</span></span></pre></div>
<a id="trunkSourceWTFwtfFastMalloch"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FastMalloc.h (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FastMalloc.h 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/WTF/wtf/FastMalloc.h 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -37,6 +37,10 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE size_t fastMallocSize(const void*);
</span><span class="cx"> WTF_EXPORT_PRIVATE size_t fastMallocGoodSize(size_t);
</span><span class="cx">
</span><ins>+ // Allocations from fastAlignedMalloc() must be freed using fastAlignedFree().
+ WTF_EXPORT_PRIVATE void* fastAlignedMalloc(size_t alignment, size_t);
+ WTF_EXPORT_PRIVATE void fastAlignedFree(void*);
+
</ins><span class="cx"> struct TryMallocReturnValue {
</span><span class="cx"> TryMallocReturnValue(void* data)
</span><span class="cx"> : m_data(data)
</span><span class="lines">@@ -231,6 +235,8 @@
</span><span class="cx"> using WTF::tryFastMalloc;
</span><span class="cx"> using WTF::tryFastRealloc;
</span><span class="cx"> using WTF::tryFastZeroedMalloc;
</span><ins>+using WTF::fastAlignedMalloc;
+using WTF::fastAlignedFree;
</ins><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> using WTF::fastMallocForbid;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/WebCore/ChangeLog 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-01-26 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.
+
+ * platform/cocoa/MemoryPressureHandlerCocoa.mm:
+ (WebCore::MemoryPressureHandler::install): Be sure to release other
+ memory after GC and not before, since GC might contribute to free
+ malloc pages now.
+
</ins><span class="cx"> 2015-01-27 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Make FlowContents an iterator class.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm (179191 => 179192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2015-01-27 18:24:15 UTC (rev 179191)
+++ trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2015-01-27 18:29:29 UTC (rev 179192)
</span><span class="lines">@@ -115,14 +115,11 @@
</span><span class="cx">
</span><span class="cx"> // Allow simulation of memory pressure with "notifyutil -p org.WebKit.lowMemory"
</span><span class="cx"> notify_register_dispatch("org.WebKit.lowMemory", &_notifyToken, dispatch_get_main_queue(), ^(int) {
</span><del>- memoryPressureHandler().respondToMemoryPressure(true);
-
</del><span class="cx"> // We only do a synchronous GC when *simulating* memory pressure.
</span><span class="cx"> // This gives us a more consistent picture of live objects at the end of testing.
</span><span class="cx"> gcController().garbageCollectNow();
</span><span class="cx">
</span><del>- // Release any freed up blocks from the JS heap back to the system.
- JSDOMWindowBase::commonVM().heap.blockAllocator().releaseFreeRegions();
</del><ins>+ memoryPressureHandler().respondToMemoryPressure(true);
</ins><span class="cx">
</span><span class="cx"> malloc_zone_pressure_relief(nullptr, 0);
</span><span class="cx"> });
</span></span></pre>
</div>
</div>
</body>
</html>