<!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>[198198] trunk/Source/bmalloc</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/198198">198198</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2016-03-14 22:39:35 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/197955">r197955</a>.
I decided to go in another direction
Reverted changeset:
"bmalloc: Rename SmallPage to SmallRun"
https://bugs.webkit.org/show_bug.cgi?id=155320
http://trac.webkit.org/changeset/197955</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocAllocatorcpp">trunk/Source/bmalloc/bmalloc/Allocator.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocHeapcpp">trunk/Source/bmalloc/bmalloc/Heap.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocHeaph">trunk/Source/bmalloc/bmalloc/Heap.h</a></li>
<li><a href="#trunkSourcebmallocbmallocLineMetadatah">trunk/Source/bmalloc/bmalloc/LineMetadata.h</a></li>
<li><a href="#trunkSourcebmallocbmallocSmallChunkh">trunk/Source/bmalloc/bmalloc/SmallChunk.h</a></li>
<li><a href="#trunkSourcebmallocbmallocVMHeapcpp">trunk/Source/bmalloc/bmalloc/VMHeap.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocVMHeaph">trunk/Source/bmalloc/bmalloc/VMHeap.h</a></li>
<li><a href="#trunkSourcebmallocbmallocxcodeprojprojectpbxproj">trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocbmallocSmallPageh">trunk/Source/bmalloc/bmalloc/SmallPage.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocbmallocSmallRunh">trunk/Source/bmalloc/bmalloc/SmallRun.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (198197 => 198198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2016-03-15 05:32:45 UTC (rev 198197)
+++ trunk/Source/bmalloc/ChangeLog 2016-03-15 05:39:35 UTC (rev 198198)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-14 Geoffrey Garen <ggaren@apple.com>
+
+ Unreviewed, rolling out r197955.
+
+ I decided to go in another direction
+
+ Reverted changeset:
+
+ "bmalloc: Rename SmallPage to SmallRun"
+ https://bugs.webkit.org/show_bug.cgi?id=155320
+ http://trac.webkit.org/changeset/197955
+
</ins><span class="cx"> 2016-03-10 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> bmalloc: Rename SmallPage to SmallRun
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocAllocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Allocator.cpp (198197 => 198198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Allocator.cpp 2016-03-15 05:32:45 UTC (rev 198197)
+++ trunk/Source/bmalloc/bmalloc/Allocator.cpp 2016-03-15 05:39:35 UTC (rev 198198)
</span><span class="lines">@@ -114,8 +114,8 @@
</span><span class="cx"> size_t oldSize = 0;
</span><span class="cx"> switch (objectType(object)) {
</span><span class="cx"> case Small: {
</span><del>- SmallRun* run = SmallRun::get(SmallLine::get(object));
- oldSize = objectSize(run->sizeClass());
</del><ins>+ SmallPage* page = SmallPage::get(SmallLine::get(object));
+ oldSize = objectSize(page->sizeClass());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case Large: {
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Heap.cpp (198197 => 198198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Heap.cpp 2016-03-15 05:32:45 UTC (rev 198197)
+++ trunk/Source/bmalloc/bmalloc/Heap.cpp 2016-03-15 05:39:35 UTC (rev 198198)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "PerProcess.h"
</span><span class="cx"> #include "SmallChunk.h"
</span><span class="cx"> #include "SmallLine.h"
</span><del>-#include "SmallRun.h"
</del><ins>+#include "SmallPage.h"
</ins><span class="cx"> #include <thread>
</span><span class="cx">
</span><span class="cx"> namespace bmalloc {
</span><span class="lines">@@ -40,16 +40,16 @@
</span><span class="cx"> , m_isAllocatingPages(false)
</span><span class="cx"> , m_scavenger(*this, &Heap::concurrentScavenge)
</span><span class="cx"> {
</span><del>- initializeSmallRunMetadata();
</del><ins>+ initializeLineMetadata();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Heap::initializeSmallRunMetadata()
</del><ins>+void Heap::initializeLineMetadata()
</ins><span class="cx"> {
</span><del>- // We assume that m_smallRunMetadata is zero-filled.
</del><ins>+ // We assume that m_smallLineMetadata is zero-filled.
</ins><span class="cx">
</span><span class="cx"> for (size_t size = alignment; size <= smallMax; size += alignment) {
</span><span class="cx"> size_t sizeClass = bmalloc::sizeClass(size);
</span><del>- auto& metadata = m_smallRunMetadata[sizeClass];
</del><ins>+ auto& metadata = m_smallLineMetadata[sizeClass];
</ins><span class="cx">
</span><span class="cx"> size_t object = 0;
</span><span class="cx"> size_t line = 0;
</span><span class="lines">@@ -84,17 +84,17 @@
</span><span class="cx"> {
</span><span class="cx"> waitUntilFalse(lock, sleepDuration, m_isAllocatingPages);
</span><span class="cx">
</span><del>- scavengeSmallRuns(lock, sleepDuration);
</del><ins>+ scavengeSmallPages(lock, sleepDuration);
</ins><span class="cx"> scavengeLargeObjects(lock, sleepDuration);
</span><span class="cx"> scavengeXLargeObjects(lock, sleepDuration);
</span><span class="cx">
</span><span class="cx"> sleep(lock, sleepDuration);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Heap::scavengeSmallRuns(std::unique_lock<StaticMutex>& lock, std::chrono::milliseconds sleepDuration)
</del><ins>+void Heap::scavengeSmallPages(std::unique_lock<StaticMutex>& lock, std::chrono::milliseconds sleepDuration)
</ins><span class="cx"> {
</span><del>- while (!m_smallRuns.isEmpty()) {
- m_vmHeap.deallocateSmallRun(lock, m_smallRuns.pop());
</del><ins>+ while (!m_smallPages.isEmpty()) {
+ m_vmHeap.deallocateSmallPage(lock, m_smallPages.pop());
</ins><span class="cx"> waitUntilFalse(lock, sleepDuration, m_isAllocatingPages);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -126,22 +126,22 @@
</span><span class="cx"> void Heap::allocateSmallBumpRanges(std::lock_guard<StaticMutex>& lock, size_t sizeClass, BumpAllocator& allocator, BumpRangeCache& rangeCache)
</span><span class="cx"> {
</span><span class="cx"> BASSERT(!rangeCache.size());
</span><del>- SmallRun* run = allocateSmallRun(lock, sizeClass);
- SmallLine* lines = run->begin();
- BASSERT(run->hasFreeLines(lock));
</del><ins>+ SmallPage* page = allocateSmallPage(lock, sizeClass);
+ SmallLine* lines = page->begin();
+ BASSERT(page->hasFreeLines(lock));
</ins><span class="cx">
</span><span class="cx"> // Find a free line.
</span><span class="cx"> for (size_t lineNumber = 0; lineNumber < smallLineCount; ++lineNumber) {
</span><span class="cx"> if (lines[lineNumber].refCount(lock))
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- LineMetadata& lineMetadata = m_smallRunMetadata[sizeClass][lineNumber];
</del><ins>+ LineMetadata& lineMetadata = m_smallLineMetadata[sizeClass][lineNumber];
</ins><span class="cx"> if (!lineMetadata.objectCount)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- // In a fragmented run, some free ranges might not fit in the cache.
</del><ins>+ // In a fragmented page, some free ranges might not fit in the cache.
</ins><span class="cx"> if (rangeCache.size() == rangeCache.capacity()) {
</span><del>- m_smallRunsWithFreeLines[sizeClass].push(run);
</del><ins>+ m_smallPagesWithFreeLines[sizeClass].push(page);
</ins><span class="cx"> BASSERT(allocator.canAllocate());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -149,20 +149,20 @@
</span><span class="cx"> char* begin = lines[lineNumber].begin() + lineMetadata.startOffset;
</span><span class="cx"> unsigned short objectCount = lineMetadata.objectCount;
</span><span class="cx"> lines[lineNumber].ref(lock, lineMetadata.objectCount);
</span><del>- run->ref(lock);
</del><ins>+ page->ref(lock);
</ins><span class="cx">
</span><span class="cx"> // Merge with subsequent free lines.
</span><span class="cx"> while (++lineNumber < smallLineCount) {
</span><span class="cx"> if (lines[lineNumber].refCount(lock))
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- LineMetadata& lineMetadata = m_smallRunMetadata[sizeClass][lineNumber];
</del><ins>+ LineMetadata& lineMetadata = m_smallLineMetadata[sizeClass][lineNumber];
</ins><span class="cx"> if (!lineMetadata.objectCount)
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> objectCount += lineMetadata.objectCount;
</span><span class="cx"> lines[lineNumber].ref(lock, lineMetadata.objectCount);
</span><del>- run->ref(lock);
</del><ins>+ page->ref(lock);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!allocator.canAllocate())
</span><span class="lines">@@ -172,45 +172,46 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BASSERT(allocator.canAllocate());
</span><del>- run->setHasFreeLines(lock, false);
</del><ins>+ page->setHasFreeLines(lock, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-SmallRun* Heap::allocateSmallRun(std::lock_guard<StaticMutex>& lock, size_t sizeClass)
</del><ins>+SmallPage* Heap::allocateSmallPage(std::lock_guard<StaticMutex>& lock, size_t sizeClass)
</ins><span class="cx"> {
</span><del>- if (!m_smallRunsWithFreeLines[sizeClass].isEmpty())
- return m_smallRunsWithFreeLines[sizeClass].pop();
</del><ins>+ if (!m_smallPagesWithFreeLines[sizeClass].isEmpty())
+ return m_smallPagesWithFreeLines[sizeClass].pop();
</ins><span class="cx">
</span><del>- SmallRun* run = [this, &lock]() {
- if (!m_smallRuns.isEmpty())
- return m_smallRuns.pop();
</del><ins>+ SmallPage* page = [this, &lock]() {
+ if (!m_smallPages.isEmpty())
+ return m_smallPages.pop();
</ins><span class="cx">
</span><span class="cx"> m_isAllocatingPages = true;
</span><del>- return m_vmHeap.allocateSmallRun(lock);
</del><ins>+ SmallPage* page = m_vmHeap.allocateSmallPage(lock);
+ return page;
</ins><span class="cx"> }();
</span><span class="cx">
</span><del>- run->setSizeClass(sizeClass);
- return run;
</del><ins>+ page->setSizeClass(sizeClass);
+ return page;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Heap::deallocateSmallLine(std::lock_guard<StaticMutex>& lock, SmallLine* line)
</span><span class="cx"> {
</span><span class="cx"> BASSERT(!line->refCount(lock));
</span><del>- SmallRun* run = SmallRun::get(line);
- run->deref(lock);
</del><ins>+ SmallPage* page = SmallPage::get(line);
+ page->deref(lock);
</ins><span class="cx">
</span><del>- if (!run->hasFreeLines(lock)) {
- run->setHasFreeLines(lock, true);
- m_smallRunsWithFreeLines[run->sizeClass()].push(run);
</del><ins>+ if (!page->hasFreeLines(lock)) {
+ page->setHasFreeLines(lock, true);
+ m_smallPagesWithFreeLines[page->sizeClass()].push(page);
</ins><span class="cx">
</span><del>- BASSERT(run->refCount(lock));
</del><ins>+ BASSERT(page->refCount(lock));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (run->refCount(lock))
</del><ins>+ if (page->refCount(lock))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_smallRunsWithFreeLines[run->sizeClass()].remove(run);
- m_smallRuns.push(run);
</del><ins>+ m_smallPagesWithFreeLines[page->sizeClass()].remove(page);
+ m_smallPages.push(page);
</ins><span class="cx"> m_scavenger.run();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Heap.h (198197 => 198198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Heap.h 2016-03-15 05:32:45 UTC (rev 198197)
+++ trunk/Source/bmalloc/bmalloc/Heap.h 2016-03-15 05:39:35 UTC (rev 198198)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include "SegregatedFreeList.h"
</span><span class="cx"> #include "SmallChunk.h"
</span><span class="cx"> #include "SmallLine.h"
</span><del>-#include "SmallRun.h"
</del><ins>+#include "SmallPage.h"
</ins><span class="cx"> #include "VMHeap.h"
</span><span class="cx"> #include "Vector.h"
</span><span class="cx"> #include "XLargeMap.h"
</span><span class="lines">@@ -72,9 +72,9 @@
</span><span class="cx"> private:
</span><span class="cx"> ~Heap() = delete;
</span><span class="cx">
</span><del>- void initializeSmallRunMetadata();
</del><ins>+ void initializeLineMetadata();
</ins><span class="cx">
</span><del>- SmallRun* allocateSmallRun(std::lock_guard<StaticMutex>&, size_t sizeClass);
</del><ins>+ SmallPage* allocateSmallPage(std::lock_guard<StaticMutex>&, size_t sizeClass);
</ins><span class="cx">
</span><span class="cx"> void deallocateSmallLine(std::lock_guard<StaticMutex>&, SmallLine*);
</span><span class="cx"> void deallocateLarge(std::lock_guard<StaticMutex>&, const LargeObject&);
</span><span class="lines">@@ -88,15 +88,15 @@
</span><span class="cx"> XLargeRange splitAndAllocate(XLargeRange&, size_t alignment, size_t);
</span><span class="cx">
</span><span class="cx"> void concurrentScavenge();
</span><del>- void scavengeSmallRuns(std::unique_lock<StaticMutex>&, std::chrono::milliseconds);
</del><ins>+ void scavengeSmallPages(std::unique_lock<StaticMutex>&, std::chrono::milliseconds);
</ins><span class="cx"> void scavengeLargeObjects(std::unique_lock<StaticMutex>&, std::chrono::milliseconds);
</span><span class="cx"> void scavengeXLargeObjects(std::unique_lock<StaticMutex>&, std::chrono::milliseconds);
</span><span class="cx">
</span><del>- std::array<RunMetadata, smallMax / alignment> m_smallRunMetadata;
</del><ins>+ std::array<std::array<LineMetadata, smallLineCount>, smallMax / alignment> m_smallLineMetadata;
</ins><span class="cx">
</span><del>- std::array<List<SmallRun>, smallMax / alignment> m_smallRunsWithFreeLines;
</del><ins>+ std::array<List<SmallPage>, smallMax / alignment> m_smallPagesWithFreeLines;
</ins><span class="cx">
</span><del>- List<SmallRun> m_smallRuns;
</del><ins>+ List<SmallPage> m_smallPages;
</ins><span class="cx">
</span><span class="cx"> SegregatedFreeList m_largeObjects;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocLineMetadatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/LineMetadata.h (198197 => 198198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/LineMetadata.h 2016-03-15 05:32:45 UTC (rev 198197)
+++ trunk/Source/bmalloc/bmalloc/LineMetadata.h 2016-03-15 05:39:35 UTC (rev 198198)
</span><span class="lines">@@ -33,8 +33,6 @@
</span><span class="cx"> unsigned short objectCount;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-typedef std::array<LineMetadata, smallLineCount> RunMetadata;
-
</del><span class="cx"> } // namespace bmalloc
</span><span class="cx">
</span><span class="cx"> #endif // LineMetadata_h
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocSmallChunkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/SmallChunk.h (198197 => 198198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/SmallChunk.h 2016-03-15 05:32:45 UTC (rev 198197)
+++ trunk/Source/bmalloc/bmalloc/SmallChunk.h 2016-03-15 05:39:35 UTC (rev 198198)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "Sizes.h"
</span><span class="cx"> #include "SmallLine.h"
</span><del>-#include "SmallRun.h"
</del><ins>+#include "SmallPage.h"
</ins><span class="cx"> #include "VMAllocate.h"
</span><span class="cx">
</span><span class="cx"> namespace bmalloc {
</span><span class="lines">@@ -39,15 +39,15 @@
</span><span class="cx">
</span><span class="cx"> static SmallChunk* get(void*);
</span><span class="cx">
</span><del>- SmallRun* begin() { return SmallRun::get(SmallLine::get(m_memory)); }
- SmallRun* end() { return m_runs.end(); }
</del><ins>+ SmallPage* begin() { return SmallPage::get(SmallLine::get(m_memory)); }
+ SmallPage* end() { return m_pages.end(); }
</ins><span class="cx">
</span><span class="cx"> SmallLine* lines() { return m_lines.begin(); }
</span><del>- SmallRun* runs() { return m_runs.begin(); }
</del><ins>+ SmallPage* pages() { return m_pages.begin(); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> std::array<SmallLine, smallChunkSize / smallLineSize> m_lines;
</span><del>- std::array<SmallRun, smallChunkSize / vmPageSize> m_runs;
</del><ins>+ std::array<SmallPage, smallChunkSize / vmPageSize> m_pages;
</ins><span class="cx"> char m_memory[] __attribute__((aligned(2 * smallMax + 0)));
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -63,11 +63,11 @@
</span><span class="cx"> for (SmallLine* line = m_lines.begin(); line < SmallLine::get(m_memory); ++line) {
</span><span class="cx"> line->ref(lock, 1);
</span><span class="cx">
</span><del>- SmallRun* page = SmallRun::get(line);
</del><ins>+ SmallPage* page = SmallPage::get(line);
</ins><span class="cx"> page->ref(lock);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (SmallRun* page = begin(); page != end(); ++page)
</del><ins>+ for (SmallPage* page = begin(); page != end(); ++page)
</ins><span class="cx"> page->setHasFreeLines(lock, true);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -98,23 +98,23 @@
</span><span class="cx"> return begin() + smallLineSize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline SmallRun* SmallRun::get(SmallLine* line)
</del><ins>+inline SmallPage* SmallPage::get(SmallLine* line)
</ins><span class="cx"> {
</span><span class="cx"> SmallChunk* chunk = SmallChunk::get(line);
</span><span class="cx"> size_t lineNumber = line - chunk->lines();
</span><del>- size_t runNumber = lineNumber * smallLineSize / vmPageSize;
- return &chunk->runs()[runNumber];
</del><ins>+ size_t pageNumber = lineNumber * smallLineSize / vmPageSize;
+ return &chunk->pages()[pageNumber];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline SmallLine* SmallRun::begin()
</del><ins>+inline SmallLine* SmallPage::begin()
</ins><span class="cx"> {
</span><span class="cx"> SmallChunk* chunk = SmallChunk::get(this);
</span><del>- size_t runNumber = this - chunk->runs();
- size_t lineNumber = runNumber * smallLineCount;
</del><ins>+ size_t pageNumber = this - chunk->pages();
+ size_t lineNumber = pageNumber * smallLineCount;
</ins><span class="cx"> return &chunk->lines()[lineNumber];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline SmallLine* SmallRun::end()
</del><ins>+inline SmallLine* SmallPage::end()
</ins><span class="cx"> {
</span><span class="cx"> return begin() + smallLineCount;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocSmallPagehfromrev197954trunkSourcebmallocbmallocSmallPageh"></a>
<div class="copfile"><h4>Copied: trunk/Source/bmalloc/bmalloc/SmallPage.h (from rev 197954, trunk/Source/bmalloc/bmalloc/SmallPage.h) (0 => 198198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/SmallPage.h (rev 0)
+++ trunk/Source/bmalloc/bmalloc/SmallPage.h 2016-03-15 05:39:35 UTC (rev 198198)
</span><span class="lines">@@ -0,0 +1,83 @@
</span><ins>+/*
+ * Copyright (C) 2014-2016 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. ``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
+ * 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 SmallPage_h
+#define SmallPage_h
+
+#include "BAssert.h"
+#include "List.h"
+#include "Mutex.h"
+#include "VMAllocate.h"
+#include <mutex>
+
+namespace bmalloc {
+
+class SmallPage : public ListNode<SmallPage> {
+public:
+ static const unsigned char maxRefCount = std::numeric_limits<unsigned char>::max();
+ static_assert(smallLineCount < maxRefCount, "maximum line count must fit in SmallPage");
+
+ static SmallPage* get(SmallLine*);
+
+ SmallPage()
+ : m_hasFreeLines(true)
+ {
+ }
+
+ void ref(std::lock_guard<StaticMutex>&);
+ bool deref(std::lock_guard<StaticMutex>&);
+ unsigned refCount(std::lock_guard<StaticMutex>&) { return m_refCount; }
+
+ size_t sizeClass() { return m_sizeClass; }
+ void setSizeClass(size_t sizeClass) { m_sizeClass = sizeClass; }
+
+ bool hasFreeLines(std::lock_guard<StaticMutex>&) const { return m_hasFreeLines; }
+ void setHasFreeLines(std::lock_guard<StaticMutex>&, bool hasFreeLines) { m_hasFreeLines = hasFreeLines; }
+
+ SmallLine* begin();
+ SmallLine* end();
+
+private:
+ unsigned char m_hasFreeLines: 1;
+ unsigned char m_refCount: 7;
+ unsigned char m_sizeClass;
+};
+
+inline void SmallPage::ref(std::lock_guard<StaticMutex>&)
+{
+ BASSERT(m_refCount < maxRefCount);
+ ++m_refCount;
+}
+
+inline bool SmallPage::deref(std::lock_guard<StaticMutex>&)
+{
+ BASSERT(m_refCount);
+ --m_refCount;
+ return !m_refCount;
+}
+
+} // namespace bmalloc
+
+#endif // SmallPage_h
</ins></span></pre></div>
<a id="trunkSourcebmallocbmallocSmallRunh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/bmalloc/bmalloc/SmallRun.h (198197 => 198198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/SmallRun.h 2016-03-15 05:32:45 UTC (rev 198197)
+++ trunk/Source/bmalloc/bmalloc/SmallRun.h 2016-03-15 05:39:35 UTC (rev 198198)
</span><span class="lines">@@ -1,83 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014-2016 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. ``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
- * 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 SmallRun_h
-#define SmallRun_h
-
-#include "BAssert.h"
-#include "List.h"
-#include "Mutex.h"
-#include "VMAllocate.h"
-#include <mutex>
-
-namespace bmalloc {
-
-class SmallRun : public ListNode<SmallRun> {
-public:
- static const unsigned char maxRefCount = std::numeric_limits<unsigned char>::max();
- static_assert(smallLineCount < maxRefCount, "maximum line count must fit in SmallRun");
-
- static SmallRun* get(SmallLine*);
-
- SmallRun()
- : m_hasFreeLines(true)
- {
- }
-
- void ref(std::lock_guard<StaticMutex>&);
- bool deref(std::lock_guard<StaticMutex>&);
- unsigned refCount(std::lock_guard<StaticMutex>&) { return m_refCount; }
-
- size_t sizeClass() { return m_sizeClass; }
- void setSizeClass(size_t sizeClass) { m_sizeClass = sizeClass; }
-
- bool hasFreeLines(std::lock_guard<StaticMutex>&) const { return m_hasFreeLines; }
- void setHasFreeLines(std::lock_guard<StaticMutex>&, bool hasFreeLines) { m_hasFreeLines = hasFreeLines; }
-
- SmallLine* begin();
- SmallLine* end();
-
-private:
- unsigned char m_hasFreeLines: 1;
- unsigned char m_refCount: 7;
- unsigned char m_sizeClass;
-};
-
-inline void SmallRun::ref(std::lock_guard<StaticMutex>&)
-{
- BASSERT(m_refCount < maxRefCount);
- ++m_refCount;
-}
-
-inline bool SmallRun::deref(std::lock_guard<StaticMutex>&)
-{
- BASSERT(m_refCount);
- --m_refCount;
- return !m_refCount;
-}
-
-} // namespace bmalloc
-
-#endif // SmallRun_h
</del></span></pre></div>
<a id="trunkSourcebmallocbmallocVMHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/VMHeap.cpp (198197 => 198198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/VMHeap.cpp 2016-03-15 05:32:45 UTC (rev 198197)
+++ trunk/Source/bmalloc/bmalloc/VMHeap.cpp 2016-03-15 05:39:35 UTC (rev 198198)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> // We initialize chunks lazily to avoid dirtying their metadata pages.
</span><span class="cx"> SmallChunk* smallChunk = new (m_smallChunks.pop()->smallChunk()) SmallChunk(lock);
</span><span class="cx"> for (auto* it = smallChunk->begin(); it < smallChunk->end(); ++it)
</span><del>- m_smallRuns.push(it);
</del><ins>+ m_smallPages.push(it);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LargeObject VMHeap::allocateLargeChunk(std::lock_guard<StaticMutex>& lock)
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocVMHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/VMHeap.h (198197 => 198198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/VMHeap.h 2016-03-15 05:32:45 UTC (rev 198197)
+++ trunk/Source/bmalloc/bmalloc/VMHeap.h 2016-03-15 05:39:35 UTC (rev 198198)
</span><span class="lines">@@ -50,11 +50,11 @@
</span><span class="cx"> public:
</span><span class="cx"> VMHeap();
</span><span class="cx">
</span><del>- SmallRun* allocateSmallRun(std::lock_guard<StaticMutex>&);
</del><ins>+ SmallPage* allocateSmallPage(std::lock_guard<StaticMutex>&);
</ins><span class="cx"> LargeObject allocateLargeObject(std::lock_guard<StaticMutex>&, size_t);
</span><span class="cx"> LargeObject allocateLargeObject(std::lock_guard<StaticMutex>&, size_t, size_t, size_t);
</span><span class="cx">
</span><del>- void deallocateSmallRun(std::unique_lock<StaticMutex>&, SmallRun*);
</del><ins>+ void deallocateSmallPage(std::unique_lock<StaticMutex>&, SmallPage*);
</ins><span class="cx"> void deallocateLargeObject(std::unique_lock<StaticMutex>&, LargeObject);
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> LargeObject allocateLargeChunk(std::lock_guard<StaticMutex>&);
</span><span class="cx"> void allocateSuperChunk(std::lock_guard<StaticMutex>&);
</span><span class="cx">
</span><del>- List<SmallRun> m_smallRuns;
</del><ins>+ List<SmallPage> m_smallPages;
</ins><span class="cx"> SegregatedFreeList m_largeObjects;
</span><span class="cx">
</span><span class="cx"> Vector<SuperChunk*> m_smallChunks;
</span><span class="lines">@@ -73,14 +73,14 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline SmallRun* VMHeap::allocateSmallRun(std::lock_guard<StaticMutex>& lock)
</del><ins>+inline SmallPage* VMHeap::allocateSmallPage(std::lock_guard<StaticMutex>& lock)
</ins><span class="cx"> {
</span><del>- if (m_smallRuns.isEmpty())
</del><ins>+ if (m_smallPages.isEmpty())
</ins><span class="cx"> allocateSmallChunk(lock);
</span><span class="cx">
</span><del>- SmallRun* run = m_smallRuns.pop();
- vmAllocatePhysicalPages(run->begin()->begin(), vmPageSize);
- return run;
</del><ins>+ SmallPage* page = m_smallPages.pop();
+ vmAllocatePhysicalPages(page->begin()->begin(), vmPageSize);
+ return page;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline LargeObject VMHeap::allocateLargeObject(std::lock_guard<StaticMutex>& lock, size_t size)
</span><span class="lines">@@ -101,13 +101,13 @@
</span><span class="cx"> return allocateLargeChunk(lock);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void VMHeap::deallocateSmallRun(std::unique_lock<StaticMutex>& lock, SmallRun* run)
</del><ins>+inline void VMHeap::deallocateSmallPage(std::unique_lock<StaticMutex>& lock, SmallPage* page)
</ins><span class="cx"> {
</span><span class="cx"> lock.unlock();
</span><del>- vmDeallocatePhysicalPages(run->begin()->begin(), vmPageSize);
</del><ins>+ vmDeallocatePhysicalPages(page->begin()->begin(), vmPageSize);
</ins><span class="cx"> lock.lock();
</span><span class="cx">
</span><del>- m_smallRuns.push(run);
</del><ins>+ m_smallPages.push(page);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void VMHeap::deallocateLargeObject(std::unique_lock<StaticMutex>& lock, LargeObject largeObject)
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj (198197 => 198198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj 2016-03-15 05:32:45 UTC (rev 198197)
+++ trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj 2016-03-15 05:39:35 UTC (rev 198198)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> 14DD789C18F48D4A00950702 /* BumpAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1413E462189DE1CD00546D68 /* BumpAllocator.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 14DD78BB18F48D6B00950702 /* SmallChunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 147AAA8C18CD36A7002201E4 /* SmallChunk.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 14DD78BC18F48D6B00950702 /* SmallLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1452478618BC757C00F80098 /* SmallLine.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 14DD78BD18F48D6B00950702 /* SmallRun.h in Headers */ = {isa = PBXBuildFile; fileRef = 143E29ED18CAE90500FE8A0F /* SmallRun.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ 14DD78BD18F48D6B00950702 /* SmallPage.h in Headers */ = {isa = PBXBuildFile; fileRef = 143E29ED18CAE90500FE8A0F /* SmallPage.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 14DD78C518F48D7500950702 /* Algorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = 1421A87718EE462A00B4DD68 /* Algorithm.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 14DD78C618F48D7500950702 /* AsyncTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 1417F65218BA88A00076FA3F /* AsyncTask.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 14DD78C718F48D7500950702 /* BAssert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1413E468189EEDE400546D68 /* BAssert.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> 1421A87718EE462A00B4DD68 /* Algorithm.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Algorithm.h; path = bmalloc/Algorithm.h; sourceTree = "<group>"; };
</span><span class="cx"> 143CB81A19022BC900B16A45 /* StaticMutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StaticMutex.cpp; path = bmalloc/StaticMutex.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 143CB81B19022BC900B16A45 /* StaticMutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StaticMutex.h; path = bmalloc/StaticMutex.h; sourceTree = "<group>"; };
</span><del>- 143E29ED18CAE90500FE8A0F /* SmallRun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SmallRun.h; path = bmalloc/SmallRun.h; sourceTree = "<group>"; };
</del><ins>+ 143E29ED18CAE90500FE8A0F /* SmallPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SmallPage.h; path = bmalloc/SmallPage.h; sourceTree = "<group>"; };
</ins><span class="cx"> 143EF9AD1A9FABF6004F5C77 /* FreeList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FreeList.cpp; path = bmalloc/FreeList.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 143EF9AE1A9FABF6004F5C77 /* FreeList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FreeList.h; path = bmalloc/FreeList.h; sourceTree = "<group>"; };
</span><span class="cx"> 1440AFC81A95142400837FAA /* SuperChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SuperChunk.h; path = bmalloc/SuperChunk.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> children = (
</span><span class="cx"> 147AAA8C18CD36A7002201E4 /* SmallChunk.h */,
</span><span class="cx"> 1452478618BC757C00F80098 /* SmallLine.h */,
</span><del>- 143E29ED18CAE90500FE8A0F /* SmallRun.h */,
</del><ins>+ 143E29ED18CAE90500FE8A0F /* SmallPage.h */,
</ins><span class="cx"> );
</span><span class="cx"> name = "heap: small";
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -346,7 +346,7 @@
</span><span class="cx"> 1400274918F89C1300115C97 /* Heap.h in Headers */,
</span><span class="cx"> 140FA00319CE429C00FFD3C8 /* BumpRange.h in Headers */,
</span><span class="cx"> 14DD78C518F48D7500950702 /* Algorithm.h in Headers */,
</span><del>- 14DD78BD18F48D6B00950702 /* SmallRun.h in Headers */,
</del><ins>+ 14DD78BD18F48D6B00950702 /* SmallPage.h in Headers */,
</ins><span class="cx"> 14DD788E18F48CCD00950702 /* BoundaryTag.h in Headers */,
</span><span class="cx"> 146041E71C7FF2EF00E9F94E /* SortedVector.h in Headers */,
</span><span class="cx"> 14DD78C818F48D7500950702 /* FixedVector.h in Headers */,
</span></span></pre>
</div>
</div>
</body>
</html>