<!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>[179500] 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/179500">179500</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-02-02 14:27:18 -0800 (Mon, 02 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use FastMalloc (bmalloc) instead of BlockAllocator for GC pages
https://bugs.webkit.org/show_bug.cgi?id=140900
Reviewed by Mark Hahnenberg.
Re-landing just the HandleBlock piece of this patch.
Source/JavaScriptCore:
* heap/HandleBlock.h:
* heap/HandleBlockInlines.h:
(JSC::HandleBlock::create):
(JSC::HandleBlock::destroy):
(JSC::HandleBlock::HandleBlock):
(JSC::HandleBlock::payloadEnd):
* heap/HandleSet.cpp:
(JSC::HandleSet::~HandleSet):
(JSC::HandleSet::grow):
Source/WebCore:
* platform/cocoa/MemoryPressureHandlerCocoa.mm:
(WebCore::MemoryPressureHandler::install):
Source/WTF:
* wtf/FastMalloc.cpp:
(WTF::fastAlignedMalloc):
(WTF::fastAlignedFree):
(WTF::TCMalloc_ThreadCache::CreateCacheIfNecessary):
* wtf/FastMalloc.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</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="#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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (179499 => 179500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-02-02 22:22:48 UTC (rev 179499)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-02-02 22:27:18 UTC (rev 179500)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-02-02 Geoffrey Garen <ggaren@apple.com>
+
+ Use FastMalloc (bmalloc) instead of BlockAllocator for GC pages
+ https://bugs.webkit.org/show_bug.cgi?id=140900
+
+ Reviewed by Mark Hahnenberg.
+
+ Re-landing just the HandleBlock piece of this patch.
+
+ * heap/HandleBlock.h:
+ * heap/HandleBlockInlines.h:
+ (JSC::HandleBlock::create):
+ (JSC::HandleBlock::destroy):
+ (JSC::HandleBlock::HandleBlock):
+ (JSC::HandleBlock::payloadEnd):
+ * heap/HandleSet.cpp:
+ (JSC::HandleSet::~HandleSet):
+ (JSC::HandleSet::grow):
+
</ins><span class="cx"> 2015-02-02 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Support console.table
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHandleBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HandleBlock.h (179499 => 179500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HandleBlock.h 2015-02-02 22:22:48 UTC (rev 179499)
+++ trunk/Source/JavaScriptCore/heap/HandleBlock.h 2015-02-02 22:27:18 UTC (rev 179500)
</span><span class="lines">@@ -34,9 +34,11 @@
</span><span class="cx"> class HandleSet;
</span><span class="cx"> class HandleNode;
</span><span class="cx">
</span><del>-class HandleBlock : public HeapBlock<HandleBlock> {
</del><ins>+class HandleBlock : public DoublyLinkedListNode<HandleBlock> {
+ friend class WTF::DoublyLinkedListNode<HandleBlock>;
</ins><span class="cx"> public:
</span><del>- static HandleBlock* create(DeadBlock*, HandleSet*);
</del><ins>+ static HandleBlock* create(HandleSet*);
+ static void destroy(HandleBlock*);
</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,13 +50,15 @@
</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 class="cx">
</span><span class="cx"> static const size_t s_blockMask = ~(blockSize - 1);
</span><span class="cx">
</span><ins>+ HandleBlock* m_prev;
+ HandleBlock* m_next;
</ins><span class="cx"> HandleSet* m_handleSet;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHandleBlockInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HandleBlockInlines.h (179499 => 179500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HandleBlockInlines.h 2015-02-02 22:22:48 UTC (rev 179499)
+++ trunk/Source/JavaScriptCore/heap/HandleBlockInlines.h 2015-02-02 22:27:18 UTC (rev 179500)
</span><span class="lines">@@ -28,24 +28,30 @@
</span><span class="cx">
</span><span class="cx"> #include "BlockAllocator.h"
</span><span class="cx"> #include "HandleBlock.h"
</span><ins>+#include <wtf/FastMalloc.h>
</ins><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 void HandleBlock::destroy(HandleBlock* block)
+{
+ block->~HandleBlock();
+ fastAlignedFree(block);
+}
+
+inline HandleBlock::HandleBlock(HandleSet* handleSet)
+ : DoublyLinkedListNode<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 (179499 => 179500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HandleSet.cpp 2015-02-02 22:22:48 UTC (rev 179499)
+++ trunk/Source/JavaScriptCore/heap/HandleSet.cpp 2015-02-02 22:27:18 UTC (rev 179500)
</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="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (179499 => 179500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-02-02 22:22:48 UTC (rev 179499)
+++ trunk/Source/WTF/ChangeLog 2015-02-02 22:27:18 UTC (rev 179500)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-02-02 Geoffrey Garen <ggaren@apple.com>
+
+ Use FastMalloc (bmalloc) instead of BlockAllocator for GC pages
+ https://bugs.webkit.org/show_bug.cgi?id=140900
+
+ Reviewed by Mark Hahnenberg.
+
+ Re-landing just the HandleBlock piece of this patch.
+
+ * wtf/FastMalloc.cpp:
+ (WTF::fastAlignedMalloc):
+ (WTF::fastAlignedFree):
+ (WTF::TCMalloc_ThreadCache::CreateCacheIfNecessary):
+ * wtf/FastMalloc.h:
+
</ins><span class="cx"> 2015-02-02 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] ASSERTION FAILED: m_scriptExecutionContext->isContextThread() in ContextDestructionObserver::observeContext
</span></span></pre></div>
<a id="trunkSourceWTFwtfFastMalloccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (179499 => 179500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FastMalloc.cpp 2015-02-02 22:22:48 UTC (rev 179499)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2015-02-02 22:27:18 UTC (rev 179500)
</span><span class="lines">@@ -162,6 +162,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"> return malloc(n);
</span><span class="lines">@@ -273,6 +301,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">@@ -4024,7 +4062,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">@@ -4095,7 +4132,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">@@ -4152,6 +4188,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 (179499 => 179500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FastMalloc.h 2015-02-02 22:22:48 UTC (rev 179499)
+++ trunk/Source/WTF/wtf/FastMalloc.h 2015-02-02 22:27:18 UTC (rev 179500)
</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">@@ -104,6 +108,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"> #if COMPILER(GCC) && OS(DARWIN)
</span><span class="cx"> #define WTF_PRIVATE_INLINE __private_extern__ inline __attribute__((always_inline))
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179499 => 179500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-02 22:22:48 UTC (rev 179499)
+++ trunk/Source/WebCore/ChangeLog 2015-02-02 22:27:18 UTC (rev 179500)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-02-02 Geoffrey Garen <ggaren@apple.com>
+
+ Use FastMalloc (bmalloc) instead of BlockAllocator for GC pages
+ https://bugs.webkit.org/show_bug.cgi?id=140900
+
+ Reviewed by Mark Hahnenberg.
+
+ Re-landing just the HandleBlock piece of this patch.
+
+ * platform/cocoa/MemoryPressureHandlerCocoa.mm:
+ (WebCore::MemoryPressureHandler::install):
+
</ins><span class="cx"> 2015-02-02 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] 64-bit build fix after r179492.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm (179499 => 179500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2015-02-02 22:22:48 UTC (rev 179499)
+++ trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2015-02-02 22:27:18 UTC (rev 179500)
</span><span class="lines">@@ -124,6 +124,8 @@
</span><span class="cx"> // Release any freed up blocks from the JS heap back to the system.
</span><span class="cx"> JSDOMWindowBase::commonVM().heap.blockAllocator().releaseFreeRegions();
</span><span class="cx">
</span><ins>+ WTF::releaseFastMallocFreeMemory();
+
</ins><span class="cx"> malloc_zone_pressure_relief(nullptr, 0);
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>