<!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>[179361] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179361">179361</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-01-29 13:41:32 -0800 (Thu, 29 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.
Re-landing just the WeakBlock piece of this patch.
* heap/WeakBlock.cpp:
(JSC::WeakBlock::create):
(JSC::WeakBlock::destroy):
(JSC::WeakBlock::WeakBlock):
* heap/WeakBlock.h:
* heap/WeakSet.cpp:
(JSC::WeakSet::~WeakSet):
(JSC::WeakSet::addAllocator):
(JSC::WeakSet::removeAllocator):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (179360 => 179361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-29 21:32:32 UTC (rev 179360)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-29 21:41:32 UTC (rev 179361)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-01-29 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><ins>+ 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 WeakBlock piece of this patch.
+
+ * heap/WeakBlock.cpp:
+ (JSC::WeakBlock::create):
+ (JSC::WeakBlock::destroy):
+ (JSC::WeakBlock::WeakBlock):
+ * heap/WeakBlock.h:
+ * heap/WeakSet.cpp:
+ (JSC::WeakSet::~WeakSet):
+ (JSC::WeakSet::addAllocator):
+ (JSC::WeakSet::removeAllocator):
+
+2015-01-29 Geoffrey Garen <ggaren@apple.com>
+
</ins><span class="cx"> Use Vector instead of GCSegmentedArray in CodeBlockSet
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=141044
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapWeakBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/WeakBlock.cpp (179360 => 179361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/WeakBlock.cpp 2015-01-29 21:32:32 UTC (rev 179360)
+++ trunk/Source/JavaScriptCore/heap/WeakBlock.cpp 2015-01-29 21:41:32 UTC (rev 179361)
</span><span class="lines">@@ -34,15 +34,20 @@
</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, fastMalloc(blockSize)) WeakBlock();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-WeakBlock::WeakBlock(Region* region)
- : HeapBlock<WeakBlock>(region)
</del><ins>+void WeakBlock::destroy(WeakBlock* block)
</ins><span class="cx"> {
</span><ins>+ block->~WeakBlock();
+ fastFree(block);
+}
+
+WeakBlock::WeakBlock()
+ : DoublyLinkedListNode<WeakBlock>()
+{
</ins><span class="cx"> for (size_t i = 0; i < weakImplCount(); ++i) {
</span><span class="cx"> WeakImpl* weakImpl = &weakImpls()[i];
</span><span class="cx"> new (NotNull, weakImpl) WeakImpl;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapWeakBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/WeakBlock.h (179360 => 179361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/WeakBlock.h 2015-01-29 21:32:32 UTC (rev 179360)
+++ trunk/Source/JavaScriptCore/heap/WeakBlock.h 2015-01-29 21:41:32 UTC (rev 179361)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef WeakBlock_h
</span><span class="cx"> #define WeakBlock_h
</span><span class="cx">
</span><del>-#include "HeapBlock.h"
</del><ins>+#include <wtf/DoublyLinkedList.h>
</ins><span class="cx"> #include "WeakHandleOwner.h"
</span><span class="cx"> #include "WeakImpl.h"
</span><span class="cx"> #include <wtf/DoublyLinkedList.h>
</span><span class="lines">@@ -34,14 +34,13 @@
</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="cx">
</span><del>-class WeakBlock : public HeapBlock<WeakBlock> {
</del><ins>+class WeakBlock : public DoublyLinkedListNode<WeakBlock> {
</ins><span class="cx"> public:
</span><del>- friend class WTF::DoublyLinkedListNode<WeakBlock>;
</del><ins>+ friend class DoublyLinkedListNode<WeakBlock>;
</ins><span class="cx"> static const size_t blockSize = 4 * KB; // 5% of MarkedBlock size
</span><span class="cx">
</span><span class="cx"> struct FreeCell {
</span><span class="lines">@@ -56,7 +55,8 @@
</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();
+ static void destroy(WeakBlock*);
</ins><span class="cx">
</span><span class="cx"> static WeakImpl* asWeakImpl(FreeCell*);
</span><span class="cx">
</span><span class="lines">@@ -73,13 +73,15 @@
</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 class="cx"> size_t weakImplCount();
</span><span class="cx"> void addToFreeList(FreeCell**, WeakImpl*);
</span><span class="cx">
</span><ins>+ WeakBlock* m_prev;
+ WeakBlock* m_next;
</ins><span class="cx"> SweepResult m_sweepResult;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapWeakSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/WeakSet.cpp (179360 => 179361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/WeakSet.cpp 2015-01-29 21:32:32 UTC (rev 179360)
+++ trunk/Source/JavaScriptCore/heap/WeakSet.cpp 2015-01-29 21:41:32 UTC (rev 179361)
</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>
</div>
</body>
</html>