<!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>[166897] 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/166897">166897</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2014-04-07 17:12:16 -0700 (Mon, 07 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>bmalloc: rolled out the tryLock experiment
https://bugs.webkit.org/show_bug.cgi?id=131328
Reviewed by Andreas Kling.
It wasn't a speedup.
* bmalloc.xcodeproj/project.pbxproj:
* bmalloc/Allocator.cpp:
(bmalloc::Allocator::processSmallAllocatorLog):
(bmalloc::Allocator::processMediumAllocatorLog):
* bmalloc/Deallocator.cpp:
(bmalloc::Deallocator::processObjectLog):
(bmalloc::Deallocator::deallocateSlowCase):
(bmalloc::Deallocator::deallocateSmallLine):
(bmalloc::Deallocator::deallocateMediumLine):
* bmalloc/Deallocator.h:
(bmalloc::Deallocator::deallocateFastCase):
* bmalloc/Heap.h:
(bmalloc::Heap::deallocateSmallLine):
(bmalloc::Heap::deallocateMediumLine):
* bmalloc/Line.h:
(bmalloc::Line<Traits>::deref):
* bmalloc/Page.h:
(bmalloc::Page<Traits>::deref):</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="#trunkSourcebmallocbmallocDeallocatorcpp">trunk/Source/bmalloc/bmalloc/Deallocator.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocDeallocatorh">trunk/Source/bmalloc/bmalloc/Deallocator.h</a></li>
<li><a href="#trunkSourcebmallocbmallocHeaph">trunk/Source/bmalloc/bmalloc/Heap.h</a></li>
<li><a href="#trunkSourcebmallocbmallocLineh">trunk/Source/bmalloc/bmalloc/Line.h</a></li>
<li><a href="#trunkSourcebmallocbmallocPageh">trunk/Source/bmalloc/bmalloc/Page.h</a></li>
<li><a href="#trunkSourcebmallocbmallocxcodeprojprojectpbxproj">trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (166896 => 166897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2014-04-08 00:07:45 UTC (rev 166896)
+++ trunk/Source/bmalloc/ChangeLog 2014-04-08 00:12:16 UTC (rev 166897)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2014-04-07 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><ins>+ bmalloc: rolled out the tryLock experiment
+ https://bugs.webkit.org/show_bug.cgi?id=131328
+
+ Reviewed by Andreas Kling.
+
+ It wasn't a speedup.
+
+ * bmalloc.xcodeproj/project.pbxproj:
+ * bmalloc/Allocator.cpp:
+ (bmalloc::Allocator::processSmallAllocatorLog):
+ (bmalloc::Allocator::processMediumAllocatorLog):
+ * bmalloc/Deallocator.cpp:
+ (bmalloc::Deallocator::processObjectLog):
+ (bmalloc::Deallocator::deallocateSlowCase):
+ (bmalloc::Deallocator::deallocateSmallLine):
+ (bmalloc::Deallocator::deallocateMediumLine):
+ * bmalloc/Deallocator.h:
+ (bmalloc::Deallocator::deallocateFastCase):
+ * bmalloc/Heap.h:
+ (bmalloc::Heap::deallocateSmallLine):
+ (bmalloc::Heap::deallocateMediumLine):
+ * bmalloc/Line.h:
+ (bmalloc::Line<Traits>::deref):
+ * bmalloc/Page.h:
+ (bmalloc::Page<Traits>::deref):
+
+2014-04-07 Geoffrey Garen <ggaren@apple.com>
+
</ins><span class="cx"> bmalloc
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=131170
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocAllocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Allocator.cpp (166896 => 166897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Allocator.cpp 2014-04-08 00:07:45 UTC (rev 166896)
+++ trunk/Source/bmalloc/bmalloc/Allocator.cpp 2014-04-08 00:12:16 UTC (rev 166897)
</span><span class="lines">@@ -75,9 +75,9 @@
</span><span class="cx"> std::lock_guard<Mutex> lock(PerProcess<Heap>::mutex());
</span><span class="cx">
</span><span class="cx"> for (auto& logEntry : m_smallAllocatorLog) {
</span><del>- if (!logEntry.first->deref(logEntry.second))
</del><ins>+ if (!logEntry.first->deref(lock, logEntry.second))
</ins><span class="cx"> continue;
</span><del>- m_deallocator.deallocateSmallLine(logEntry.first);
</del><ins>+ m_deallocator.deallocateSmallLine(lock, logEntry.first);
</ins><span class="cx"> }
</span><span class="cx"> m_smallAllocatorLog.clear();
</span><span class="cx"> }
</span><span class="lines">@@ -98,9 +98,9 @@
</span><span class="cx"> std::lock_guard<Mutex> lock(PerProcess<Heap>::mutex());
</span><span class="cx">
</span><span class="cx"> for (auto& logEntry : m_mediumAllocatorLog) {
</span><del>- if (!logEntry.first->deref(logEntry.second))
</del><ins>+ if (!logEntry.first->deref(lock, logEntry.second))
</ins><span class="cx"> continue;
</span><del>- m_deallocator.deallocateMediumLine(logEntry.first);
</del><ins>+ m_deallocator.deallocateMediumLine(lock, logEntry.first);
</ins><span class="cx"> }
</span><span class="cx"> m_mediumAllocatorLog.clear();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocDeallocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Deallocator.cpp (166896 => 166897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Deallocator.cpp 2014-04-08 00:07:45 UTC (rev 166896)
+++ trunk/Source/bmalloc/bmalloc/Deallocator.cpp 2014-04-08 00:12:16 UTC (rev 166897)
</span><span class="lines">@@ -65,18 +65,20 @@
</span><span class="cx">
</span><span class="cx"> void Deallocator::processObjectLog()
</span><span class="cx"> {
</span><ins>+ std::lock_guard<Mutex> lock(PerProcess<Heap>::mutex());
+
</ins><span class="cx"> for (auto object : m_objectLog) {
</span><span class="cx"> if (isSmall(object)) {
</span><span class="cx"> SmallLine* line = SmallLine::get(object);
</span><del>- if (!line->deref())
</del><ins>+ if (!line->deref(lock))
</ins><span class="cx"> continue;
</span><del>- deallocateSmallLine(line);
</del><ins>+ deallocateSmallLine(lock, line);
</ins><span class="cx"> } else {
</span><span class="cx"> ASSERT(isSmallOrMedium(object));
</span><span class="cx"> MediumLine* line = MediumLine::get(object);
</span><del>- if (!line->deref())
</del><ins>+ if (!line->deref(lock))
</ins><span class="cx"> continue;
</span><del>- deallocateMediumLine(line);
</del><ins>+ deallocateMediumLine(lock, line);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -91,17 +93,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (isSmallOrMedium(object)) {
</span><del>- std::unique_lock<Mutex> lock(PerProcess<Heap>::mutex(), std::defer_lock);
- bool didLock;
- if (m_objectLog.size() == m_objectLog.capacity()) {
- didLock = true;
- lock.lock();
- } else
- didLock = lock.try_lock();
-
- if (didLock)
- processObjectLog();
-
</del><ins>+ processObjectLog();
</ins><span class="cx"> m_objectLog.push(object);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -113,10 +105,10 @@
</span><span class="cx"> return deallocateXLarge(object);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Deallocator::deallocateSmallLine(SmallLine* line)
</del><ins>+void Deallocator::deallocateSmallLine(std::lock_guard<Mutex>& lock, SmallLine* line)
</ins><span class="cx"> {
</span><span class="cx"> if (m_smallLineCache.size() == m_smallLineCache.capacity())
</span><del>- return PerProcess<Heap>::getFastCase()->deallocateSmallLine(line);
</del><ins>+ return PerProcess<Heap>::getFastCase()->deallocateSmallLine(lock, line);
</ins><span class="cx">
</span><span class="cx"> m_smallLineCache.push(line);
</span><span class="cx"> }
</span><span class="lines">@@ -134,10 +126,10 @@
</span><span class="cx"> return m_smallLineCache.pop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Deallocator::deallocateMediumLine(MediumLine* line)
</del><ins>+void Deallocator::deallocateMediumLine(std::lock_guard<Mutex>& lock, MediumLine* line)
</ins><span class="cx"> {
</span><span class="cx"> if (m_mediumLineCache.size() == m_mediumLineCache.capacity())
</span><del>- return PerProcess<Heap>::getFastCase()->deallocateMediumLine(line);
</del><ins>+ return PerProcess<Heap>::getFastCase()->deallocateMediumLine(lock, line);
</ins><span class="cx">
</span><span class="cx"> m_mediumLineCache.push(line);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocDeallocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Deallocator.h (166896 => 166897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Deallocator.h 2014-04-08 00:07:45 UTC (rev 166896)
+++ trunk/Source/bmalloc/bmalloc/Deallocator.h 2014-04-08 00:12:16 UTC (rev 166897)
</span><span class="lines">@@ -44,10 +44,10 @@
</span><span class="cx"> bool deallocateFastCase(void*);
</span><span class="cx"> void deallocateSlowCase(void*);
</span><span class="cx">
</span><del>- void deallocateSmallLine(SmallLine*);
</del><ins>+ void deallocateSmallLine(std::lock_guard<Mutex>&, SmallLine*);
</ins><span class="cx"> SmallLine* allocateSmallLine();
</span><span class="cx">
</span><del>- void deallocateMediumLine(MediumLine*);
</del><ins>+ void deallocateMediumLine(std::lock_guard<Mutex>&, MediumLine*);
</ins><span class="cx"> MediumLine* allocateMediumLine();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(object);
</span><span class="cx">
</span><del>- if (!(m_objectLog.size() % (m_objectLog.capacity() / 4)))
</del><ins>+ if (m_objectLog.size() == m_objectLog.capacity())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> m_objectLog.push(object);
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Heap.h (166896 => 166897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Heap.h 2014-04-08 00:07:45 UTC (rev 166896)
+++ trunk/Source/bmalloc/bmalloc/Heap.h 2014-04-08 00:12:16 UTC (rev 166897)
</span><span class="lines">@@ -50,10 +50,10 @@
</span><span class="cx"> Heap(std::lock_guard<Mutex>&);
</span><span class="cx">
</span><span class="cx"> SmallLine* allocateSmallLine(std::lock_guard<Mutex>&);
</span><del>- void deallocateSmallLine(SmallLine*);
</del><ins>+ void deallocateSmallLine(std::lock_guard<Mutex>&, SmallLine*);
</ins><span class="cx">
</span><span class="cx"> MediumLine* allocateMediumLine(std::lock_guard<Mutex>&);
</span><del>- void deallocateMediumLine(MediumLine*);
</del><ins>+ void deallocateMediumLine(std::lock_guard<Mutex>&, MediumLine*);
</ins><span class="cx">
</span><span class="cx"> void* allocateLarge(std::lock_guard<Mutex>&, size_t);
</span><span class="cx"> void deallocateLarge(std::lock_guard<Mutex>&, void*);
</span><span class="lines">@@ -94,10 +94,10 @@
</span><span class="cx"> AsyncTask<Heap, decltype(&Heap::concurrentScavenge)> m_scavenger;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline void Heap::deallocateSmallLine(SmallLine* line)
</del><ins>+inline void Heap::deallocateSmallLine(std::lock_guard<Mutex>& lock, SmallLine* line)
</ins><span class="cx"> {
</span><span class="cx"> SmallPage* page = SmallPage::get(line);
</span><del>- if (page->deref()) {
</del><ins>+ if (page->deref(lock)) {
</ins><span class="cx"> m_smallPages.push(page);
</span><span class="cx"> m_scavenger.run();
</span><span class="cx"> return;
</span><span class="lines">@@ -119,10 +119,10 @@
</span><span class="cx"> return allocateSmallLineSlowCase(lock);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void Heap::deallocateMediumLine(MediumLine* line)
</del><ins>+inline void Heap::deallocateMediumLine(std::lock_guard<Mutex>& lock, MediumLine* line)
</ins><span class="cx"> {
</span><span class="cx"> MediumPage* page = MediumPage::get(line);
</span><del>- if (page->deref()) {
</del><ins>+ if (page->deref(lock)) {
</ins><span class="cx"> m_mediumPages.push(page);
</span><span class="cx"> m_scavenger.run();
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocLineh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Line.h (166896 => 166897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Line.h 2014-04-08 00:07:45 UTC (rev 166896)
+++ trunk/Source/bmalloc/bmalloc/Line.h 2014-04-08 00:12:16 UTC (rev 166897)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> static Line* get(void*);
</span><span class="cx">
</span><span class="cx"> void concurrentRef(unsigned char = 1);
</span><del>- bool deref(unsigned char = 1);
</del><ins>+ bool deref(std::lock_guard<Mutex>&, unsigned char = 1);
</ins><span class="cx">
</span><span class="cx"> char* begin();
</span><span class="cx"> char* end();
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<class Traits>
</span><del>-inline bool Line<Traits>::deref(unsigned char count)
</del><ins>+inline bool Line<Traits>::deref(std::lock_guard<Mutex>&, unsigned char count)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(count <= m_refCount);
</span><span class="cx"> m_refCount -= count;
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Page.h (166896 => 166897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Page.h 2014-04-08 00:07:45 UTC (rev 166896)
+++ trunk/Source/bmalloc/bmalloc/Page.h 2014-04-08 00:12:16 UTC (rev 166897)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> static Page* get(Line*);
</span><span class="cx">
</span><span class="cx"> void ref(std::lock_guard<Mutex>&);
</span><del>- bool deref();
</del><ins>+ bool deref(std::lock_guard<Mutex>&);
</ins><span class="cx"> unsigned refCount(std::lock_guard<Mutex>&);
</span><span class="cx">
</span><span class="cx"> Line* begin();
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Traits>
</span><del>-inline bool Page<Traits>::deref()
</del><ins>+inline bool Page<Traits>::deref(std::lock_guard<Mutex>&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_refCount);
</span><span class="cx"> --m_refCount;
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj (166896 => 166897)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj 2014-04-08 00:07:45 UTC (rev 166896)
+++ trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj 2014-04-08 00:12:16 UTC (rev 166897)
</span><span class="lines">@@ -7,9 +7,9 @@
</span><span class="cx"> objects = {
</span><span class="cx">
</span><span class="cx"> /* Begin PBXBuildFile section */
</span><del>- 14CC390518EA627D004AFE34 /* bmalloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 14CC390418EA627D004AFE34 /* bmalloc.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ 1448C30018F3754600502839 /* mbmalloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1448C2FF18F3754300502839 /* mbmalloc.cpp */; };
+ 1448C30118F3754C00502839 /* bmalloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 1448C2FE18F3754300502839 /* bmalloc.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 14CC394C18EA8858004AFE34 /* libbmalloc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14F271BE18EA3963008C152F /* libbmalloc.a */; };
</span><del>- 14D2868918EB759A0012420E /* mbmalloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14D2868818EB759A0012420E /* mbmalloc.cpp */; };
</del><span class="cx"> 14F271C318EA3978008C152F /* Allocator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 145F6855179DC8CA00D65598 /* Allocator.cpp */; };
</span><span class="cx"> 14F271C418EA397B008C152F /* Cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 144469E417A46BFE00F9EA1D /* Cache.cpp */; };
</span><span class="cx"> 14F271C518EA397E008C152F /* Deallocator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 145F6859179DC90200D65598 /* Deallocator.cpp */; };
</span><span class="lines">@@ -48,6 +48,8 @@
</span><span class="cx"> 144469E517A46BFE00F9EA1D /* Cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = Cache.h; path = bmalloc/Cache.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
</span><span class="cx"> 144469FD17A61F1F00F9EA1D /* PerThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = PerThread.h; path = bmalloc/PerThread.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
</span><span class="cx"> 14446A0717A61FA400F9EA1D /* PerProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PerProcess.h; path = bmalloc/PerProcess.h; sourceTree = "<group>"; };
</span><ins>+ 1448C2FE18F3754300502839 /* bmalloc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = bmalloc.h; path = bmalloc/bmalloc.h; sourceTree = "<group>"; };
+ 1448C2FF18F3754300502839 /* mbmalloc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mbmalloc.cpp; path = bmalloc/mbmalloc.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 144DCED617A649D90093B2F2 /* Mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Mutex.h; path = bmalloc/Mutex.h; sourceTree = "<group>"; };
</span><span class="cx"> 144DCED817A728570093B2F2 /* Mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Mutex.cpp; path = bmalloc/Mutex.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 144F7BFB18BFC517003537F3 /* VMHeap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VMHeap.cpp; path = bmalloc/VMHeap.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -74,9 +76,7 @@
</span><span class="cx"> 147AAA9718CE5FB6002201E4 /* SmallTraits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SmallTraits.h; path = bmalloc/SmallTraits.h; sourceTree = "<group>"; };
</span><span class="cx"> 1485655E18A43AF900ED6942 /* BoundaryTag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BoundaryTag.h; path = bmalloc/BoundaryTag.h; sourceTree = "<group>"; };
</span><span class="cx"> 1485656018A43DBA00ED6942 /* ObjectType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjectType.h; path = bmalloc/ObjectType.h; sourceTree = "<group>"; };
</span><del>- 14CC390418EA627D004AFE34 /* bmalloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bmalloc.h; path = bmalloc/bmalloc.h; sourceTree = SOURCE_ROOT; };
</del><span class="cx"> 14CC394418EA8743004AFE34 /* libmbmalloc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libmbmalloc.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
</span><del>- 14D2868818EB759A0012420E /* mbmalloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mbmalloc.cpp; path = bmalloc/mbmalloc.cpp; sourceTree = SOURCE_ROOT; };
</del><span class="cx"> 14D9DB4517F2447100EAAB79 /* FixedVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = FixedVector.h; path = bmalloc/FixedVector.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
</span><span class="cx"> 14DA32071885F9E6007269E0 /* Line.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = Line.h; path = bmalloc/Line.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
</span><span class="cx"> 14DA320C18875B09007269E0 /* Heap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Heap.h; path = bmalloc/Heap.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -103,10 +103,19 @@
</span><span class="cx"> /* End PBXFrameworksBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXGroup section */
</span><ins>+ 1448C2FD18F3752B00502839 /* api */ = {
+ isa = PBXGroup;
+ children = (
+ 1448C2FE18F3754300502839 /* bmalloc.h */,
+ 1448C2FF18F3754300502839 /* mbmalloc.cpp */,
+ );
+ name = api;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 145F6836179DC45F00D65598 = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><del>- 14F271B718EA285B008C152F /* api */,
</del><ins>+ 1448C2FD18F3752B00502839 /* api */,
</ins><span class="cx"> 14D9DB4D17F2865C00EAAB79 /* cache */,
</span><span class="cx"> 147AAA9C18CE6010002201E4 /* heap: large | xlarge */,
</span><span class="cx"> 147AAA9A18CE5FD3002201E4 /* heap: small | medium */,
</span><span class="lines">@@ -207,16 +216,6 @@
</span><span class="cx"> name = stdlib;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><del>- 14F271B718EA285B008C152F /* api */ = {
- isa = PBXGroup;
- children = (
- 14CC390418EA627D004AFE34 /* bmalloc.h */,
- 14D2868818EB759A0012420E /* mbmalloc.cpp */,
- );
- name = api;
- path = imalloc;
- sourceTree = "<group>";
- };
</del><span class="cx"> /* End PBXGroup section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXHeadersBuildPhase section */
</span><span class="lines">@@ -231,7 +230,7 @@
</span><span class="cx"> isa = PBXHeadersBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- 14CC390518EA627D004AFE34 /* bmalloc.h in Headers */,
</del><ins>+ 1448C30118F3754C00502839 /* bmalloc.h in Headers */,
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -305,7 +304,7 @@
</span><span class="cx"> isa = PBXSourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- 14D2868918EB759A0012420E /* mbmalloc.cpp in Sources */,
</del><ins>+ 1448C30018F3754600502839 /* mbmalloc.cpp in Sources */,
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>