<!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>[166956] 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/166956">166956</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2014-04-08 13:36:07 -0700 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Made bmalloc more #include friendly
https://bugs.webkit.org/show_bug.cgi?id=131386
Reviewed by Andreas Kling.
Marked a bunch of headers private so they can be used from client code
that #includes bmalloc.h.
Renamed ASSERT macros to BASSERT. This matches their header, which already
had to be renamed, and fixes conflicts with WTF's ASSERT macros.
* bmalloc.xcodeproj/project.pbxproj:
* bmalloc/Allocator.cpp:
(bmalloc::Allocator::allocateSlowCase):
* bmalloc/AsyncTask.h:
(bmalloc::Function>::runSlowCase):
* bmalloc/BAssert.h:
* bmalloc/BoundaryTag.h:
(bmalloc::BoundaryTag::setSize):
* bmalloc/BoundaryTagInlines.h:
(bmalloc::validate):
(bmalloc::BoundaryTag::init):
(bmalloc::BoundaryTag::deallocate):
(bmalloc::BoundaryTag::splitLarge):
(bmalloc::BoundaryTag::allocate):
* bmalloc/Chunk.h:
* bmalloc/Deallocator.cpp:
(bmalloc::Deallocator::processObjectLog):
(bmalloc::Deallocator::deallocateSlowCase):
* bmalloc/Deallocator.h:
(bmalloc::Deallocator::deallocateFastCase):
* bmalloc/FixedVector.h:
(bmalloc::Capacity>::operator):
(bmalloc::Capacity>::push):
(bmalloc::Capacity>::pop):
(bmalloc::Capacity>::shrink):
* bmalloc/Heap.cpp:
(bmalloc::Heap::allocateLarge):
* bmalloc/LargeChunk.h:
(bmalloc::LargeChunk::get):
(bmalloc::LargeChunk::endTag):
* bmalloc/Line.h:
(bmalloc::Line<Traits>::concurrentRef):
(bmalloc::Line<Traits>::deref):
* bmalloc/MediumAllocator.h:
(bmalloc::MediumAllocator::allocate):
* bmalloc/ObjectType.h:
(bmalloc::isSmall):
* bmalloc/Page.h:
(bmalloc::Page<Traits>::ref):
(bmalloc::Page<Traits>::deref):
* bmalloc/PerThread.h:
(bmalloc::PerThread<T>::getSlowCase):
* bmalloc/SegregatedFreeList.cpp:
(bmalloc::SegregatedFreeList::SegregatedFreeList):
(bmalloc::SegregatedFreeList::insert):
* bmalloc/SmallAllocator.h:
(bmalloc::SmallAllocator::allocate):
(bmalloc::SmallAllocator::refill):
* bmalloc/Syscall.h:
* bmalloc/VMAllocate.h:
(bmalloc::vmValidate):
(bmalloc::vmAllocate):
(bmalloc::vmDeallocatePhysicalPagesSloppy):
* bmalloc/Vector.h:
(bmalloc::Vector<T>::operator):
(bmalloc::Vector<T>::pop):
(bmalloc::Vector<T>::shrink):
* bmalloc/XLargeChunk.h:
(bmalloc::XLargeChunk::range):
(bmalloc::XLargeChunk::size):</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="#trunkSourcebmallocbmallocAsyncTaskh">trunk/Source/bmalloc/bmalloc/AsyncTask.h</a></li>
<li><a href="#trunkSourcebmallocbmallocBAsserth">trunk/Source/bmalloc/bmalloc/BAssert.h</a></li>
<li><a href="#trunkSourcebmallocbmallocBoundaryTagh">trunk/Source/bmalloc/bmalloc/BoundaryTag.h</a></li>
<li><a href="#trunkSourcebmallocbmallocBoundaryTagInlinesh">trunk/Source/bmalloc/bmalloc/BoundaryTagInlines.h</a></li>
<li><a href="#trunkSourcebmallocbmallocChunkh">trunk/Source/bmalloc/bmalloc/Chunk.h</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="#trunkSourcebmallocbmallocFixedVectorh">trunk/Source/bmalloc/bmalloc/FixedVector.h</a></li>
<li><a href="#trunkSourcebmallocbmallocHeapcpp">trunk/Source/bmalloc/bmalloc/Heap.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocLargeChunkh">trunk/Source/bmalloc/bmalloc/LargeChunk.h</a></li>
<li><a href="#trunkSourcebmallocbmallocLineh">trunk/Source/bmalloc/bmalloc/Line.h</a></li>
<li><a href="#trunkSourcebmallocbmallocMediumAllocatorh">trunk/Source/bmalloc/bmalloc/MediumAllocator.h</a></li>
<li><a href="#trunkSourcebmallocbmallocObjectTypeh">trunk/Source/bmalloc/bmalloc/ObjectType.h</a></li>
<li><a href="#trunkSourcebmallocbmallocPageh">trunk/Source/bmalloc/bmalloc/Page.h</a></li>
<li><a href="#trunkSourcebmallocbmallocPerThreadh">trunk/Source/bmalloc/bmalloc/PerThread.h</a></li>
<li><a href="#trunkSourcebmallocbmallocSegregatedFreeListcpp">trunk/Source/bmalloc/bmalloc/SegregatedFreeList.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocSmallAllocatorh">trunk/Source/bmalloc/bmalloc/SmallAllocator.h</a></li>
<li><a href="#trunkSourcebmallocbmallocSyscallh">trunk/Source/bmalloc/bmalloc/Syscall.h</a></li>
<li><a href="#trunkSourcebmallocbmallocVMAllocateh">trunk/Source/bmalloc/bmalloc/VMAllocate.h</a></li>
<li><a href="#trunkSourcebmallocbmallocVectorh">trunk/Source/bmalloc/bmalloc/Vector.h</a></li>
<li><a href="#trunkSourcebmallocbmallocXLargeChunkh">trunk/Source/bmalloc/bmalloc/XLargeChunk.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 (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/ChangeLog 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -1,5 +1,79 @@
</span><span class="cx"> 2014-04-08 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><ins>+ Made bmalloc more #include friendly
+ https://bugs.webkit.org/show_bug.cgi?id=131386
+
+ Reviewed by Andreas Kling.
+
+ Marked a bunch of headers private so they can be used from client code
+ that #includes bmalloc.h.
+
+ Renamed ASSERT macros to BASSERT. This matches their header, which already
+ had to be renamed, and fixes conflicts with WTF's ASSERT macros.
+
+ * bmalloc.xcodeproj/project.pbxproj:
+ * bmalloc/Allocator.cpp:
+ (bmalloc::Allocator::allocateSlowCase):
+ * bmalloc/AsyncTask.h:
+ (bmalloc::Function>::runSlowCase):
+ * bmalloc/BAssert.h:
+ * bmalloc/BoundaryTag.h:
+ (bmalloc::BoundaryTag::setSize):
+ * bmalloc/BoundaryTagInlines.h:
+ (bmalloc::validate):
+ (bmalloc::BoundaryTag::init):
+ (bmalloc::BoundaryTag::deallocate):
+ (bmalloc::BoundaryTag::splitLarge):
+ (bmalloc::BoundaryTag::allocate):
+ * bmalloc/Chunk.h:
+ * bmalloc/Deallocator.cpp:
+ (bmalloc::Deallocator::processObjectLog):
+ (bmalloc::Deallocator::deallocateSlowCase):
+ * bmalloc/Deallocator.h:
+ (bmalloc::Deallocator::deallocateFastCase):
+ * bmalloc/FixedVector.h:
+ (bmalloc::Capacity>::operator):
+ (bmalloc::Capacity>::push):
+ (bmalloc::Capacity>::pop):
+ (bmalloc::Capacity>::shrink):
+ * bmalloc/Heap.cpp:
+ (bmalloc::Heap::allocateLarge):
+ * bmalloc/LargeChunk.h:
+ (bmalloc::LargeChunk::get):
+ (bmalloc::LargeChunk::endTag):
+ * bmalloc/Line.h:
+ (bmalloc::Line<Traits>::concurrentRef):
+ (bmalloc::Line<Traits>::deref):
+ * bmalloc/MediumAllocator.h:
+ (bmalloc::MediumAllocator::allocate):
+ * bmalloc/ObjectType.h:
+ (bmalloc::isSmall):
+ * bmalloc/Page.h:
+ (bmalloc::Page<Traits>::ref):
+ (bmalloc::Page<Traits>::deref):
+ * bmalloc/PerThread.h:
+ (bmalloc::PerThread<T>::getSlowCase):
+ * bmalloc/SegregatedFreeList.cpp:
+ (bmalloc::SegregatedFreeList::SegregatedFreeList):
+ (bmalloc::SegregatedFreeList::insert):
+ * bmalloc/SmallAllocator.h:
+ (bmalloc::SmallAllocator::allocate):
+ (bmalloc::SmallAllocator::refill):
+ * bmalloc/Syscall.h:
+ * bmalloc/VMAllocate.h:
+ (bmalloc::vmValidate):
+ (bmalloc::vmAllocate):
+ (bmalloc::vmDeallocatePhysicalPagesSloppy):
+ * bmalloc/Vector.h:
+ (bmalloc::Vector<T>::operator):
+ (bmalloc::Vector<T>::pop):
+ (bmalloc::Vector<T>::shrink):
+ * bmalloc/XLargeChunk.h:
+ (bmalloc::XLargeChunk::range):
+ (bmalloc::XLargeChunk::size):
+
+2014-04-08 Geoffrey Garen <ggaren@apple.com>
+
</ins><span class="cx"> Removed an unused file.
</span><span class="cx">
</span><span class="cx"> Unreviewed.
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocAllocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Allocator.cpp (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Allocator.cpp 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/Allocator.cpp 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> {
</span><span class="cx"> IF_DEBUG(
</span><span class="cx"> void* dummy;
</span><del>- ASSERT(!allocateFastCase(size, dummy));
</del><ins>+ BASSERT(!allocateFastCase(size, dummy));
</ins><span class="cx"> )
</span><span class="cx"> if (size <= smallMax) {
</span><span class="cx"> SmallAllocator& allocator = smallAllocatorFor(size);
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocAsyncTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/AsyncTask.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/AsyncTask.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/AsyncTask.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(oldState == Exited);
</del><ins>+ BASSERT(oldState == Exited);
</ins><span class="cx"> pthread_create(&m_thread, nullptr, &pthreadEntryPoint, this);
</span><span class="cx"> pthread_detach(m_thread);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocBAsserth"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/BAssert.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/BAssert.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/BAssert.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -26,12 +26,12 @@
</span><span class="cx"> #ifndef BAssert_h
</span><span class="cx"> #define BAssert_h
</span><span class="cx">
</span><del>-#define ASSERT_IMPL(x) do { \
</del><ins>+#define BASSERT_IMPL(x) do { \
</ins><span class="cx"> if (!(x)) \
</span><span class="cx"> *(int*)0xbbadbeef = 0; \
</span><span class="cx"> } while(0);
</span><span class="cx">
</span><del>-#define RELEASE_ASSERT(x) ASSERT_IMPL(x)
</del><ins>+#define RELEASE_BASSERT(x) BASSERT_IMPL(x)
</ins><span class="cx">
</span><span class="cx"> #define UNUSED(x) (void)x
</span><span class="cx">
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> #if defined(NDEBUG)
</span><span class="cx">
</span><del>-#define ASSERT(x)
</del><ins>+#define BASSERT(x)
</ins><span class="cx">
</span><span class="cx"> #define IF_DEBUG(x...)
</span><span class="cx">
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> #if !defined(NDEBUG)
</span><span class="cx">
</span><del>-#define ASSERT(x) ASSERT_IMPL(x)
</del><ins>+#define BASSERT(x) BASSERT_IMPL(x)
</ins><span class="cx">
</span><span class="cx"> #define IF_DEBUG(x...) x
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocBoundaryTagh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/BoundaryTag.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/BoundaryTag.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/BoundaryTag.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -85,8 +85,8 @@
</span><span class="cx"> inline void BoundaryTag::setSize(size_t size)
</span><span class="cx"> {
</span><span class="cx"> m_size = static_cast<unsigned>(size);
</span><del>- ASSERT(this->size() == size);
- ASSERT(!isXLarge());
</del><ins>+ BASSERT(this->size() == size);
+ BASSERT(!isXLarge());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline EndTag* BoundaryTag::prev()
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocBoundaryTagInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/BoundaryTagInlines.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/BoundaryTagInlines.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/BoundaryTagInlines.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -41,18 +41,18 @@
</span><span class="cx"> BeginTag* beginTag = LargeChunk::beginTag(range.begin());
</span><span class="cx"> EndTag* endTag = LargeChunk::endTag(range.begin(), range.size());
</span><span class="cx">
</span><del>- ASSERT(!beginTag->isEnd());
</del><ins>+ BASSERT(!beginTag->isEnd());
</ins><span class="cx"> if (beginTag->isXLarge())
</span><span class="cx"> return;
</span><span class="cx"> )
</span><del>- ASSERT(range.size() >= largeMin);
- ASSERT(beginTag->size() == range.size());
</del><ins>+ BASSERT(range.size() >= largeMin);
+ BASSERT(beginTag->size() == range.size());
</ins><span class="cx">
</span><del>- ASSERT(beginTag->size() == endTag->size());
- ASSERT(beginTag->isFree() == endTag->isFree());
- ASSERT(beginTag->hasPhysicalPages() == endTag->hasPhysicalPages());
- ASSERT(beginTag->isXLarge() == endTag->isXLarge());
- ASSERT(static_cast<BoundaryTag*>(endTag) == static_cast<BoundaryTag*>(beginTag) || endTag->isEnd());
</del><ins>+ BASSERT(beginTag->size() == endTag->size());
+ BASSERT(beginTag->isFree() == endTag->isFree());
+ BASSERT(beginTag->hasPhysicalPages() == endTag->hasPhysicalPages());
+ BASSERT(beginTag->isXLarge() == endTag->isXLarge());
+ BASSERT(static_cast<BoundaryTag*>(endTag) == static_cast<BoundaryTag*>(beginTag) || endTag->isEnd());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline void validatePrev(EndTag* prev, void* object)
</span><span class="lines">@@ -96,12 +96,12 @@
</span><span class="cx"> // special-case checks.
</span><span class="cx">
</span><span class="cx"> EndTag* leftSentinel = beginTag->prev();
</span><del>- ASSERT(leftSentinel >= static_cast<void*>(chunk));
</del><ins>+ BASSERT(leftSentinel >= static_cast<void*>(chunk));
</ins><span class="cx"> leftSentinel->setSize(largeMin);
</span><span class="cx"> leftSentinel->setFree(false);
</span><span class="cx">
</span><span class="cx"> BeginTag* rightSentinel = endTag->next();
</span><del>- ASSERT(rightSentinel < static_cast<void*>(range.begin()));
</del><ins>+ BASSERT(rightSentinel < static_cast<void*>(range.begin()));
</ins><span class="cx"> rightSentinel->setSize(largeMin);
</span><span class="cx"> rightSentinel->setFree(false);
</span><span class="cx">
</span><span class="lines">@@ -163,8 +163,8 @@
</span><span class="cx"> inline Range BoundaryTag::deallocate(void* object)
</span><span class="cx"> {
</span><span class="cx"> BeginTag* beginTag = LargeChunk::beginTag(object);
</span><del>- ASSERT(!beginTag->isFree());
- ASSERT(!beginTag->isXLarge())
</del><ins>+ BASSERT(!beginTag->isFree());
+ BASSERT(!beginTag->isXLarge())
</ins><span class="cx">
</span><span class="cx"> Range range(object, beginTag->size());
</span><span class="cx"> EndTag* endTag = LargeChunk::endTag(range.begin(), range.size());
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> *splitEndTag = *beginTag;
</span><span class="cx">
</span><span class="cx"> leftover = Range(range.begin() + size, range.size() - size);
</span><del>- ASSERT(leftover.size() >= largeMin);
</del><ins>+ BASSERT(leftover.size() >= largeMin);
</ins><span class="cx"> BeginTag* leftoverBeginTag = LargeChunk::beginTag(leftover.begin());
</span><span class="cx"> *leftoverBeginTag = *beginTag;
</span><span class="cx"> leftoverBeginTag->setSize(leftover.size());
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> BeginTag* beginTag = LargeChunk::beginTag(range.begin());
</span><span class="cx"> EndTag* endTag = LargeChunk::endTag(range.begin(), range.size());
</span><span class="cx">
</span><del>- ASSERT(beginTag->isFree());
</del><ins>+ BASSERT(beginTag->isFree());
</ins><span class="cx"> validate(beginTag->prev(), range, endTag->next());
</span><span class="cx">
</span><span class="cx"> if (range.size() - size > largeMin)
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocChunkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Chunk.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Chunk.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/Chunk.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> template<class Traits>
</span><span class="cx"> inline auto Chunk<Traits>::get(void* object) -> Chunk*
</span><span class="cx"> {
</span><del>- ASSERT(isSmallOrMedium(object));
</del><ins>+ BASSERT(isSmallOrMedium(object));
</ins><span class="cx"> return static_cast<Chunk*>(mask(object, chunkMask));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocDeallocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Deallocator.cpp (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Deallocator.cpp 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/Deallocator.cpp 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> deallocateSmallLine(lock, line);
</span><span class="cx"> } else {
</span><del>- ASSERT(isSmallOrMedium(object));
</del><ins>+ BASSERT(isSmallOrMedium(object));
</ins><span class="cx"> MediumLine* line = MediumLine::get(object);
</span><span class="cx"> if (!line->deref(lock))
</span><span class="cx"> continue;
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx">
</span><span class="cx"> void Deallocator::deallocateSlowCase(void* object)
</span><span class="cx"> {
</span><del>- ASSERT(!deallocateFastCase(object));
</del><ins>+ BASSERT(!deallocateFastCase(object));
</ins><span class="cx">
</span><span class="cx"> if (!object)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocDeallocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Deallocator.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Deallocator.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/Deallocator.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> if (!isSmallOrMedium(object))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- ASSERT(object);
</del><ins>+ BASSERT(object);
</ins><span class="cx">
</span><span class="cx"> if (m_objectLog.size() == m_objectLog.capacity())
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocFixedVectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/FixedVector.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/FixedVector.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/FixedVector.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -76,14 +76,14 @@
</span><span class="cx"> template<typename T, size_t Capacity>
</span><span class="cx"> inline T& FixedVector<T, Capacity>::operator[](size_t i)
</span><span class="cx"> {
</span><del>- ASSERT(i < m_size);
</del><ins>+ BASSERT(i < m_size);
</ins><span class="cx"> return m_buffer[i];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, size_t Capacity>
</span><span class="cx"> inline void FixedVector<T, Capacity>::push(const T& value)
</span><span class="cx"> {
</span><del>- ASSERT(m_size < Capacity);
</del><ins>+ BASSERT(m_size < Capacity);
</ins><span class="cx"> m_buffer[m_size++] = value;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -97,14 +97,14 @@
</span><span class="cx"> template<typename T, size_t Capacity>
</span><span class="cx"> inline T FixedVector<T, Capacity>::pop()
</span><span class="cx"> {
</span><del>- ASSERT(m_size);
</del><ins>+ BASSERT(m_size);
</ins><span class="cx"> return m_buffer[--m_size];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, size_t Capacity>
</span><span class="cx"> inline void FixedVector<T, Capacity>::shrink(size_t size)
</span><span class="cx"> {
</span><del>- ASSERT(size <= m_size);
</del><ins>+ BASSERT(size <= m_size);
</ins><span class="cx"> m_size = size;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Heap.cpp (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Heap.cpp 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/Heap.cpp 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -170,8 +170,8 @@
</span><span class="cx">
</span><span class="cx"> void* Heap::allocateLarge(std::lock_guard<Mutex>&, size_t size)
</span><span class="cx"> {
</span><del>- ASSERT(size <= largeMax);
- ASSERT(size >= largeMin);
</del><ins>+ BASSERT(size <= largeMax);
+ BASSERT(size >= largeMin);
</ins><span class="cx">
</span><span class="cx"> m_isAllocatingPages = true;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocLargeChunkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/LargeChunk.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/LargeChunk.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/LargeChunk.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> inline LargeChunk* LargeChunk::get(void* object)
</span><span class="cx"> {
</span><del>- ASSERT(!isSmallOrMedium(object));
</del><ins>+ BASSERT(!isSmallOrMedium(object));
</ins><span class="cx"> return static_cast<LargeChunk*>(mask(object, largeChunkMask));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> inline EndTag* LargeChunk::endTag(void* object, size_t size)
</span><span class="cx"> {
</span><del>- ASSERT(!isSmallOrMedium(object));
</del><ins>+ BASSERT(!isSmallOrMedium(object));
</ins><span class="cx">
</span><span class="cx"> LargeChunk* chunk = get(object);
</span><span class="cx"> char* end = static_cast<char*>(object) + size;
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocLineh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Line.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Line.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/Line.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> template<class Traits>
</span><span class="cx"> inline auto Line<Traits>::get(void* object) -> Line*
</span><span class="cx"> {
</span><del>- ASSERT(isSmallOrMedium(object));
</del><ins>+ BASSERT(isSmallOrMedium(object));
</ins><span class="cx"> Chunk* chunk = Chunk::get(object);
</span><span class="cx"> size_t lineNumber = (reinterpret_cast<char*>(object) - reinterpret_cast<char*>(chunk)) / lineSize;
</span><span class="cx"> return &chunk->lines()[lineNumber];
</span><span class="lines">@@ -82,15 +82,15 @@
</span><span class="cx"> template<class Traits>
</span><span class="cx"> inline void Line<Traits>::concurrentRef(unsigned char count)
</span><span class="cx"> {
</span><del>- ASSERT(!m_refCount); // Up-ref from zero can be lock-free because there are no other clients.
- ASSERT(count <= maxRefCount);
</del><ins>+ BASSERT(!m_refCount); // Up-ref from zero can be lock-free because there are no other clients.
+ BASSERT(count <= maxRefCount);
</ins><span class="cx"> m_refCount = count;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<class Traits>
</span><span class="cx"> inline bool Line<Traits>::deref(std::lock_guard<Mutex>&, unsigned char count)
</span><span class="cx"> {
</span><del>- ASSERT(count <= m_refCount);
</del><ins>+ BASSERT(count <= m_refCount);
</ins><span class="cx"> m_refCount -= count;
</span><span class="cx"> return !m_refCount;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocMediumAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/MediumAllocator.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/MediumAllocator.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/MediumAllocator.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -67,13 +67,13 @@
</span><span class="cx">
</span><span class="cx"> inline void* MediumAllocator::allocate(size_t size)
</span><span class="cx"> {
</span><del>- ASSERT(size <= m_remaining);
- ASSERT(size == roundUpToMultipleOf<alignment>(size));
- ASSERT(size >= MediumLine::minimumObjectSize);
</del><ins>+ BASSERT(size <= m_remaining);
+ BASSERT(size == roundUpToMultipleOf<alignment>(size));
+ BASSERT(size >= MediumLine::minimumObjectSize);
</ins><span class="cx">
</span><span class="cx"> m_remaining -= size;
</span><span class="cx"> void* object = m_end - m_remaining - size;
</span><del>- ASSERT(isSmallOrMedium(object) && !isSmall(object));
</del><ins>+ BASSERT(isSmallOrMedium(object) && !isSmall(object));
</ins><span class="cx">
</span><span class="cx"> ++m_objectCount;
</span><span class="cx"> return object;
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocObjectTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/ObjectType.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/ObjectType.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/ObjectType.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> inline bool isSmall(void* smallOrMedium)
</span><span class="cx"> {
</span><del>- ASSERT(isSmallOrMedium(smallOrMedium));
</del><ins>+ BASSERT(isSmallOrMedium(smallOrMedium));
</ins><span class="cx"> return test(smallOrMedium, smallOrMediumSmallTypeMask);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Page.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Page.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/Page.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -59,14 +59,14 @@
</span><span class="cx"> template<typename Traits>
</span><span class="cx"> inline void Page<Traits>::ref(std::lock_guard<Mutex>&)
</span><span class="cx"> {
</span><del>- ASSERT(m_refCount < maxRefCount);
</del><ins>+ BASSERT(m_refCount < maxRefCount);
</ins><span class="cx"> ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Traits>
</span><span class="cx"> inline bool Page<Traits>::deref(std::lock_guard<Mutex>&)
</span><span class="cx"> {
</span><del>- ASSERT(m_refCount);
</del><ins>+ BASSERT(m_refCount);
</ins><span class="cx"> --m_refCount;
</span><span class="cx"> return !m_refCount;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocPerThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/PerThread.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/PerThread.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/PerThread.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> template<typename T>
</span><span class="cx"> T* PerThread<T>::getSlowCase()
</span><span class="cx"> {
</span><del>- ASSERT(!getFastCase());
</del><ins>+ BASSERT(!getFastCase());
</ins><span class="cx"> T* t = new T;
</span><span class="cx"> PerThreadStorage<T>::init(t, destructor);
</span><span class="cx"> return t;
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocSegregatedFreeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/SegregatedFreeList.cpp (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/SegregatedFreeList.cpp 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/SegregatedFreeList.cpp 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -32,14 +32,14 @@
</span><span class="cx">
</span><span class="cx"> SegregatedFreeList::SegregatedFreeList()
</span><span class="cx"> {
</span><del>- ASSERT(static_cast<size_t>(&select(largeMax) - m_lists.begin()) == m_lists.size() - 1);
</del><ins>+ BASSERT(static_cast<size_t>(&select(largeMax) - m_lists.begin()) == m_lists.size() - 1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SegregatedFreeList::insert(const Range& range)
</span><span class="cx"> {
</span><span class="cx"> IF_DEBUG(
</span><span class="cx"> BeginTag* beginTag = LargeChunk::beginTag(range.begin());
</span><del>- ASSERT(beginTag->isInFreeList(range.size()));
</del><ins>+ BASSERT(beginTag->isInFreeList(range.size()));
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> auto& list = select(range.size());
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocSmallAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/SmallAllocator.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/SmallAllocator.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/SmallAllocator.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -79,13 +79,13 @@
</span><span class="cx">
</span><span class="cx"> inline void* SmallAllocator::allocate()
</span><span class="cx"> {
</span><del>- ASSERT(m_remaining);
- ASSERT(m_size >= SmallLine::minimumObjectSize);
</del><ins>+ BASSERT(m_remaining);
+ BASSERT(m_size >= SmallLine::minimumObjectSize);
</ins><span class="cx">
</span><span class="cx"> --m_remaining;
</span><span class="cx"> char* result = m_ptr;
</span><span class="cx"> m_ptr += m_size;
</span><del>- ASSERT(isSmall(result));
</del><ins>+ BASSERT(isSmall(result));
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">
</span><span class="cx"> inline void SmallAllocator::refill(SmallLine* line)
</span><span class="cx"> {
</span><del>- ASSERT(!canAllocate());
</del><ins>+ BASSERT(!canAllocate());
</ins><span class="cx"> line->concurrentRef(SmallLine::maxRefCount);
</span><span class="cx"> m_ptr = line->begin();
</span><span class="cx"> m_remaining = m_maxObjectCount;
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocSyscallh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Syscall.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Syscall.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/Syscall.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #define SYSCALL(x) do { \
</span><span class="cx"> while ((x) == -1) \
</span><del>- RELEASE_ASSERT(errno == EAGAIN); \
</del><ins>+ RELEASE_BASSERT(errno == EAGAIN); \
</ins><span class="cx"> } while (0);
</span><span class="cx">
</span><span class="cx"> #endif // Syscall_h
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocVMAllocateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/VMAllocate.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/VMAllocate.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/VMAllocate.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx"> inline void vmValidate(size_t vmSize)
</span><span class="cx"> {
</span><span class="cx"> UNUSED(vmSize);
</span><del>- ASSERT(vmSize);
- ASSERT(vmSize == bmalloc::vmSize(vmSize));
</del><ins>+ BASSERT(vmSize);
+ BASSERT(vmSize == bmalloc::vmSize(vmSize));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void vmValidate(void* p, size_t vmSize)
</span><span class="lines">@@ -61,8 +61,8 @@
</span><span class="cx"> // We use getpagesize() here instead of vmPageSize because vmPageSize is
</span><span class="cx"> // allowed to be larger than the OS's true page size.
</span><span class="cx"> UNUSED(p);
</span><del>- ASSERT(p);
- ASSERT(p == mask(p, ~(getpagesize() - 1)));
</del><ins>+ BASSERT(p);
+ BASSERT(p == mask(p, ~(getpagesize() - 1)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void* vmAllocate(size_t vmSize)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> inline std::pair<void*, Range> vmAllocate(size_t vmSize, size_t alignment, size_t offset)
</span><span class="cx"> {
</span><span class="cx"> vmValidate(vmSize);
</span><del>- ASSERT(isPowerOfTwo(alignment));
</del><ins>+ BASSERT(isPowerOfTwo(alignment));
</ins><span class="cx">
</span><span class="cx"> size_t mappedSize = std::max(vmSize, alignment) + alignment;
</span><span class="cx"> char* mapped = static_cast<char*>(vmAllocate(mappedSize));
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> // Trims requests that are un-page-aligned. NOTE: size must be at least a page.
</span><span class="cx"> inline void vmDeallocatePhysicalPagesSloppy(void* p, size_t size)
</span><span class="cx"> {
</span><del>- ASSERT(size >= vmPageSize);
</del><ins>+ BASSERT(size >= vmPageSize);
</ins><span class="cx">
</span><span class="cx"> char* begin = roundUpToMultipleOf<vmPageSize>(static_cast<char*>(p));
</span><span class="cx"> char* end = roundDownToMultipleOf<vmPageSize>(static_cast<char*>(p) + size);
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocVectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Vector.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Vector.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/Vector.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> template<typename T>
</span><span class="cx"> inline T& Vector<T>::operator[](size_t i)
</span><span class="cx"> {
</span><del>- ASSERT(i < m_size);
</del><ins>+ BASSERT(i < m_size);
</ins><span class="cx"> return m_buffer[i];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> template<typename T>
</span><span class="cx"> inline T Vector<T>::pop()
</span><span class="cx"> {
</span><del>- ASSERT(m_size);
</del><ins>+ BASSERT(m_size);
</ins><span class="cx"> T value = m_buffer[m_size - 1];
</span><span class="cx"> shrink(m_size - 1);
</span><span class="cx"> return value;
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> template<typename T>
</span><span class="cx"> inline T Vector<T>::pop(size_t i)
</span><span class="cx"> {
</span><del>- ASSERT(i < m_size);
</del><ins>+ BASSERT(i < m_size);
</ins><span class="cx"> std::swap(m_buffer[i], last());
</span><span class="cx"> return pop();
</span><span class="cx"> }
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> template<typename T>
</span><span class="cx"> inline void Vector<T>::shrink(size_t size)
</span><span class="cx"> {
</span><del>- ASSERT(size <= m_size);
</del><ins>+ BASSERT(size <= m_size);
</ins><span class="cx"> m_size = size;
</span><span class="cx"> if (m_capacity > initialCapacity && m_size < m_capacity / shrinkFactor)
</span><span class="cx"> shrinkCapacity();
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocXLargeChunkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/XLargeChunk.h (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/XLargeChunk.h 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc/XLargeChunk.h 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> // Since we hold only one object, we only use our first BoundaryTag. So, we
</span><span class="cx"> // can stuff our range into the remaining metadata.
</span><span class="cx"> Range& result = *reinterpret_cast<Range*>(roundUpToMultipleOf<alignment>(LargeChunk::beginTag(begin()) + 1));
</span><del>- ASSERT(static_cast<void*>(&result) < static_cast<void*>(begin()));
</del><ins>+ BASSERT(static_cast<void*>(&result) < static_cast<void*>(begin()));
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> // Since we hold only one object, we only use our first BoundaryTag. So, we
</span><span class="cx"> // can stuff our size into the remaining metadata.
</span><span class="cx"> size_t& result = *reinterpret_cast<size_t*>(roundUpToMultipleOf<alignment>(&range() + 1));
</span><del>- ASSERT(static_cast<void*>(&result) < static_cast<void*>(begin()));
</del><ins>+ BASSERT(static_cast<void*>(&result) < static_cast<void*>(begin()));
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj (166955 => 166956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj 2014-04-08 20:32:36 UTC (rev 166955)
+++ trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj 2014-04-08 20:36:07 UTC (rev 166956)
</span><span class="lines">@@ -10,6 +10,41 @@
</span><span class="cx"> 1448C30018F3754600502839 /* mbmalloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1448C2FF18F3754300502839 /* mbmalloc.cpp */; };
</span><span class="cx"> 1448C30118F3754C00502839 /* bmalloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 1448C2FE18F3754300502839 /* bmalloc.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 14CC394C18EA8858004AFE34 /* libbmalloc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14F271BE18EA3963008C152F /* libbmalloc.a */; };
</span><ins>+ 14DD788C18F48CAE00950702 /* LargeChunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 147AAA8818CD17CE002201E4 /* LargeChunk.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD788D18F48CC600950702 /* BeginTag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1417F64518B54A700076FA3F /* BeginTag.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD788E18F48CCD00950702 /* BoundaryTag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1485655E18A43AF900ED6942 /* BoundaryTag.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD789018F48CEB00950702 /* Sizes.h in Headers */ = {isa = PBXBuildFile; fileRef = 145F6874179DF84100D65598 /* Sizes.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD789218F48CFC00950702 /* EndTag.h in Headers */ = {isa = PBXBuildFile; fileRef = 1417F64618B54A700076FA3F /* EndTag.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD789318F48D0F00950702 /* ObjectType.h in Headers */ = {isa = PBXBuildFile; fileRef = 1485656018A43DBA00ED6942 /* ObjectType.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD789818F48D4A00950702 /* Allocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 145F6856179DC8CA00D65598 /* Allocator.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD789918F48D4A00950702 /* Cache.h in Headers */ = {isa = PBXBuildFile; fileRef = 144469E517A46BFE00F9EA1D /* Cache.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD789A18F48D4A00950702 /* Deallocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 145F685A179DC90200D65598 /* Deallocator.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD789B18F48D4A00950702 /* MediumAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1413E47018A0661700546D68 /* MediumAllocator.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD789C18F48D4A00950702 /* SmallAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1413E462189DE1CD00546D68 /* SmallAllocator.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78B418F48D6B00950702 /* Chunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 147AAA9418CE5CA6002201E4 /* Chunk.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78B518F48D6B00950702 /* Line.h in Headers */ = {isa = PBXBuildFile; fileRef = 14DA32071885F9E6007269E0 /* Line.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78B618F48D6B00950702 /* MediumChunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 147AAA8E18CD89E3002201E4 /* MediumChunk.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78B718F48D6B00950702 /* MediumLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1452478518BC757C00F80098 /* MediumLine.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78B818F48D6B00950702 /* MediumPage.h in Headers */ = {isa = PBXBuildFile; fileRef = 143E29E918CAE8BE00FE8A0F /* MediumPage.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78B918F48D6B00950702 /* MediumTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = 147AAA9618CE5FB6002201E4 /* MediumTraits.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78BA18F48D6B00950702 /* Page.h in Headers */ = {isa = PBXBuildFile; fileRef = 146BEE2318C980D60002D5A2 /* Page.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78BB18F48D6B00950702 /* SmallChunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 147AAA8C18CD36A7002201E4 /* SmallChunk.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78BC18F48D6B00950702 /* SmallLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1452478618BC757C00F80098 /* SmallLine.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78BD18F48D6B00950702 /* SmallPage.h in Headers */ = {isa = PBXBuildFile; fileRef = 143E29ED18CAE90500FE8A0F /* SmallPage.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78BE18F48D6B00950702 /* SmallTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = 147AAA9718CE5FB6002201E4 /* SmallTraits.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78C518F48D7500950702 /* Algorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = 1421A87718EE462A00B4DD68 /* Algorithm.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78C618F48D7500950702 /* AsyncTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 1417F65218BA88A00076FA3F /* AsyncTask.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78C718F48D7500950702 /* BAssert.h in Headers */ = {isa = PBXBuildFile; fileRef = 1413E468189EEDE400546D68 /* BAssert.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78C818F48D7500950702 /* FixedVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 14D9DB4517F2447100EAAB79 /* FixedVector.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78C918F48D7500950702 /* Inline.h in Headers */ = {isa = PBXBuildFile; fileRef = 1413E460189DCE1E00546D68 /* Inline.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78CA18F48D7500950702 /* Mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = 144DCED617A649D90093B2F2 /* Mutex.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78CB18F48D7500950702 /* PerProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 14446A0717A61FA400F9EA1D /* PerProcess.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78CC18F48D7500950702 /* PerThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 144469FD17A61F1F00F9EA1D /* PerThread.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78CD18F48D7500950702 /* Range.h in Headers */ = {isa = PBXBuildFile; fileRef = 145F6878179E3A4400D65598 /* Range.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78CE18F48D7500950702 /* Syscall.h in Headers */ = {isa = PBXBuildFile; fileRef = 1417F64F18B7280C0076FA3F /* Syscall.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78CF18F48D7500950702 /* Vector.h in Headers */ = {isa = PBXBuildFile; fileRef = 1479E21217A1A255006D4E9D /* Vector.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78D018F48D7500950702 /* VMAllocate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1479E21417A1A63E006D4E9D /* VMAllocate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 14DD78D118F48EC600950702 /* XLargeChunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 147AAA8918CD17CE002201E4 /* XLargeChunk.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><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">@@ -248,7 +283,42 @@
</span><span class="cx"> isa = PBXHeadersBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><ins>+ 14DD78B518F48D6B00950702 /* Line.h in Headers */,
+ 14DD78CF18F48D7500950702 /* Vector.h in Headers */,
+ 14DD788C18F48CAE00950702 /* LargeChunk.h in Headers */,
+ 14DD789218F48CFC00950702 /* EndTag.h in Headers */,
+ 14DD78CC18F48D7500950702 /* PerThread.h in Headers */,
+ 14DD78B418F48D6B00950702 /* Chunk.h in Headers */,
+ 14DD78CA18F48D7500950702 /* Mutex.h in Headers */,
+ 14DD78D118F48EC600950702 /* XLargeChunk.h in Headers */,
+ 14DD78B918F48D6B00950702 /* MediumTraits.h in Headers */,
</ins><span class="cx"> 1448C30118F3754C00502839 /* bmalloc.h in Headers */,
</span><ins>+ 14DD789A18F48D4A00950702 /* Deallocator.h in Headers */,
+ 14DD788D18F48CC600950702 /* BeginTag.h in Headers */,
+ 14DD78CD18F48D7500950702 /* Range.h in Headers */,
+ 14DD789C18F48D4A00950702 /* SmallAllocator.h in Headers */,
+ 14DD789918F48D4A00950702 /* Cache.h in Headers */,
+ 14DD789B18F48D4A00950702 /* MediumAllocator.h in Headers */,
+ 14DD78BE18F48D6B00950702 /* SmallTraits.h in Headers */,
+ 14DD789018F48CEB00950702 /* Sizes.h in Headers */,
+ 14DD78C718F48D7500950702 /* BAssert.h in Headers */,
+ 14DD78D018F48D7500950702 /* VMAllocate.h in Headers */,
+ 14DD78CE18F48D7500950702 /* Syscall.h in Headers */,
+ 14DD78C618F48D7500950702 /* AsyncTask.h in Headers */,
+ 14DD78BA18F48D6B00950702 /* Page.h in Headers */,
+ 14DD78BB18F48D6B00950702 /* SmallChunk.h in Headers */,
+ 14DD78C918F48D7500950702 /* Inline.h in Headers */,
+ 14DD78B818F48D6B00950702 /* MediumPage.h in Headers */,
+ 14DD78C518F48D7500950702 /* Algorithm.h in Headers */,
+ 14DD78BD18F48D6B00950702 /* SmallPage.h in Headers */,
+ 14DD788E18F48CCD00950702 /* BoundaryTag.h in Headers */,
+ 14DD78C818F48D7500950702 /* FixedVector.h in Headers */,
+ 14DD78B718F48D6B00950702 /* MediumLine.h in Headers */,
+ 14DD78B618F48D6B00950702 /* MediumChunk.h in Headers */,
+ 14DD78BC18F48D6B00950702 /* SmallLine.h in Headers */,
+ 14DD789818F48D4A00950702 /* Allocator.h in Headers */,
+ 14DD78CB18F48D7500950702 /* PerProcess.h in Headers */,
+ 14DD789318F48D0F00950702 /* ObjectType.h in Headers */,
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>