<!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>[181329] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181329">181329</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-03-10 11:00:59 -0700 (Tue, 10 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>bmalloc: tryFastMalloc shouldn't crash
https://bugs.webkit.org/show_bug.cgi?id=142443
Reviewed by Sam Weinig.
Rolling back in <a href="http://trac.webkit.org/projects/webkit/changeset/181307">r181307</a> with a check for whether bmalloc is enabled, to
avoid crashes when running with ASan and GuardMalloc.
Source/bmalloc:
* bmalloc/Allocator.cpp:
(bmalloc::Allocator::tryAllocate):
* bmalloc/Allocator.h:
* bmalloc/Cache.cpp:
(bmalloc::Cache::tryAllocateSlowCaseNullCache):
* bmalloc/Cache.h:
(bmalloc::Cache::tryAllocate):
* bmalloc/Heap.cpp:
(bmalloc::Heap::allocateXLarge):
(bmalloc::Heap::tryAllocateXLarge):
* bmalloc/Heap.h:
* bmalloc/VMAllocate.h:
(bmalloc::tryVMAllocate):
(bmalloc::vmAllocate):
* bmalloc/bmalloc.h:
(bmalloc::api::tryMalloc):
(bmalloc::api::realloc):
(bmalloc::api::free):
Source/WTF:
* wtf/FastMalloc.cpp:
(WTF::fastMalloc):
(WTF::fastRealloc):
(WTF::fastAlignedMalloc):
(WTF::tryFastMalloc):
(WTF::tryFastRealloc): Deleted.
* wtf/FastMalloc.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFastMalloccpp">trunk/Source/WTF/wtf/FastMalloc.cpp</a></li>
<li><a href="#trunkSourceWTFwtfFastMalloch">trunk/Source/WTF/wtf/FastMalloc.h</a></li>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocAllocatorcpp">trunk/Source/bmalloc/bmalloc/Allocator.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocAllocatorh">trunk/Source/bmalloc/bmalloc/Allocator.h</a></li>
<li><a href="#trunkSourcebmallocbmallocCachecpp">trunk/Source/bmalloc/bmalloc/Cache.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocCacheh">trunk/Source/bmalloc/bmalloc/Cache.h</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="#trunkSourcebmallocbmallocVMAllocateh">trunk/Source/bmalloc/bmalloc/VMAllocate.h</a></li>
<li><a href="#trunkSourcebmallocbmallocbmalloch">trunk/Source/bmalloc/bmalloc/bmalloc.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (181328 => 181329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-03-10 17:55:21 UTC (rev 181328)
+++ trunk/Source/WTF/ChangeLog 2015-03-10 18:00:59 UTC (rev 181329)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-03-10 Geoffrey Garen <ggaren@apple.com>
+
+ bmalloc: tryFastMalloc shouldn't crash
+ https://bugs.webkit.org/show_bug.cgi?id=142443
+
+ Reviewed by Sam Weinig.
+
+ Rolling back in r181307 with a check for whether bmalloc is enabled, to
+ avoid crashes when running with ASan and GuardMalloc.
+
+ * wtf/FastMalloc.cpp:
+ (WTF::fastMalloc):
+ (WTF::fastRealloc):
+ (WTF::fastAlignedMalloc):
+ (WTF::tryFastMalloc):
+ (WTF::tryFastRealloc): Deleted.
+ * wtf/FastMalloc.h:
+
</ins><span class="cx"> 2015-03-10 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> GCC: CRASH() should be annotated with NORETURN
</span></span></pre></div>
<a id="trunkSourceWTFwtfFastMalloccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (181328 => 181329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FastMalloc.cpp 2015-03-10 17:55:21 UTC (rev 181328)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2015-03-10 18:00:59 UTC (rev 181329)
</span><span class="lines">@@ -150,11 +150,6 @@
</span><span class="cx"> free(p);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TryMallocReturnValue tryFastRealloc(void* p, size_t n)
-{
- return realloc(p, n);
-}
-
</del><span class="cx"> void* fastRealloc(void* p, size_t n)
</span><span class="cx"> {
</span><span class="cx"> void* result = realloc(p, n);
</span><span class="lines">@@ -194,10 +189,7 @@
</span><span class="cx">
</span><span class="cx"> void* fastMalloc(size_t size)
</span><span class="cx"> {
</span><del>- void* result = bmalloc::api::malloc(size);
- if (!result)
- CRASH();
- return result;
</del><ins>+ return bmalloc::api::malloc(size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void* fastCalloc(size_t numElements, size_t elementSize)
</span><span class="lines">@@ -212,10 +204,7 @@
</span><span class="cx">
</span><span class="cx"> void* fastRealloc(void* object, size_t size)
</span><span class="cx"> {
</span><del>- void* result = bmalloc::api::realloc(object, size);
- if (!result)
- CRASH();
- return result;
</del><ins>+ return bmalloc::api::realloc(object, size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void fastFree(void* object)
</span><span class="lines">@@ -239,10 +228,7 @@
</span><span class="cx">
</span><span class="cx"> void* fastAlignedMalloc(size_t alignment, size_t size)
</span><span class="cx"> {
</span><del>- void* result = bmalloc::api::memalign(alignment, size);
- if (!result)
- CRASH();
- return result;
</del><ins>+ return bmalloc::api::memalign(alignment, size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void fastAlignedFree(void* p)
</span><span class="lines">@@ -252,14 +238,9 @@
</span><span class="cx">
</span><span class="cx"> TryMallocReturnValue tryFastMalloc(size_t size)
</span><span class="cx"> {
</span><del>- return bmalloc::api::malloc(size);
</del><ins>+ return bmalloc::api::tryMalloc(size);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-TryMallocReturnValue tryFastRealloc(void* object, size_t size)
-{
- return bmalloc::api::realloc(object, size);
-}
-
</del><span class="cx"> TryMallocReturnValue tryFastCalloc(size_t numElements, size_t elementSize)
</span><span class="cx"> {
</span><span class="cx"> Checked<size_t, RecordOverflow> checkedSize = elementSize;
</span></span></pre></div>
<a id="trunkSourceWTFwtfFastMalloch"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FastMalloc.h (181328 => 181329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FastMalloc.h 2015-03-10 17:55:21 UTC (rev 181328)
+++ trunk/Source/WTF/wtf/FastMalloc.h 2015-03-10 18:00:59 UTC (rev 181329)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE TryMallocReturnValue tryFastMalloc(size_t);
</span><span class="cx"> TryMallocReturnValue tryFastZeroedMalloc(size_t);
</span><span class="cx"> WTF_EXPORT_PRIVATE TryMallocReturnValue tryFastCalloc(size_t numElements, size_t elementSize);
</span><del>-WTF_EXPORT_PRIVATE TryMallocReturnValue tryFastRealloc(void*, size_t);
</del><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE void fastFree(void*);
</span><span class="cx">
</span><span class="lines">@@ -108,7 +107,6 @@
</span><span class="cx"> using WTF::fastZeroedMalloc;
</span><span class="cx"> using WTF::tryFastCalloc;
</span><span class="cx"> using WTF::tryFastMalloc;
</span><del>-using WTF::tryFastRealloc;
</del><span class="cx"> using WTF::tryFastZeroedMalloc;
</span><span class="cx"> using WTF::fastAlignedMalloc;
</span><span class="cx"> using WTF::fastAlignedFree;
</span></span></pre></div>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (181328 => 181329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2015-03-10 17:55:21 UTC (rev 181328)
+++ trunk/Source/bmalloc/ChangeLog 2015-03-10 18:00:59 UTC (rev 181329)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-03-10 Geoffrey Garen <ggaren@apple.com>
+
+ bmalloc: tryFastMalloc shouldn't crash
+ https://bugs.webkit.org/show_bug.cgi?id=142443
+
+ Reviewed by Sam Weinig.
+
+ Rolling back in r181307 with a check for whether bmalloc is enabled, to
+ avoid crashes when running with ASan and GuardMalloc.
+
+ * bmalloc/Allocator.cpp:
+ (bmalloc::Allocator::tryAllocate):
+ * bmalloc/Allocator.h:
+ * bmalloc/Cache.cpp:
+ (bmalloc::Cache::tryAllocateSlowCaseNullCache):
+ * bmalloc/Cache.h:
+ (bmalloc::Cache::tryAllocate):
+ * bmalloc/Heap.cpp:
+ (bmalloc::Heap::allocateXLarge):
+ (bmalloc::Heap::tryAllocateXLarge):
+ * bmalloc/Heap.h:
+ * bmalloc/VMAllocate.h:
+ (bmalloc::tryVMAllocate):
+ (bmalloc::vmAllocate):
+ * bmalloc/bmalloc.h:
+ (bmalloc::api::tryMalloc):
+ (bmalloc::api::realloc):
+ (bmalloc::api::free):
+
</ins><span class="cx"> 2015-03-09 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r181307.
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocAllocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Allocator.cpp (181328 => 181329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Allocator.cpp 2015-03-10 17:55:21 UTC (rev 181328)
+++ trunk/Source/bmalloc/bmalloc/Allocator.cpp 2015-03-10 18:00:59 UTC (rev 181329)
</span><span class="lines">@@ -51,6 +51,18 @@
</span><span class="cx"> scavenge();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void* Allocator::tryAllocate(size_t size)
+{
+ if (!m_isBmallocEnabled)
+ return malloc(size);
+
+ if (size <= largeMax)
+ return allocate(size);
+
+ std::lock_guard<StaticMutex> lock(PerProcess<Heap>::mutex());
+ return PerProcess<Heap>::get()->tryAllocateXLarge(lock, superChunkSize, roundUpToMultipleOf<xLargeAlignment>(size));
+}
+
</ins><span class="cx"> void* Allocator::allocate(size_t alignment, size_t size)
</span><span class="cx"> {
</span><span class="cx"> BASSERT(isPowerOfTwo(alignment));
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Allocator.h (181328 => 181329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Allocator.h 2015-03-10 17:55:21 UTC (rev 181328)
+++ trunk/Source/bmalloc/bmalloc/Allocator.h 2015-03-10 18:00:59 UTC (rev 181329)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> Allocator(Heap*, Deallocator&);
</span><span class="cx"> ~Allocator();
</span><span class="cx">
</span><ins>+ void* tryAllocate(size_t);
</ins><span class="cx"> void* allocate(size_t);
</span><span class="cx"> void* allocate(size_t alignment, size_t);
</span><span class="cx"> void* reallocate(void*, size_t);
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Cache.cpp (181328 => 181329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Cache.cpp 2015-03-10 17:55:21 UTC (rev 181328)
+++ trunk/Source/bmalloc/bmalloc/Cache.cpp 2015-03-10 18:00:59 UTC (rev 181329)
</span><span class="lines">@@ -56,6 +56,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+NO_INLINE void* Cache::tryAllocateSlowCaseNullCache(size_t size)
+{
+ return PerThread<Cache>::getSlowCase()->allocator().tryAllocate(size);
+}
+
</ins><span class="cx"> NO_INLINE void* Cache::allocateSlowCaseNullCache(size_t size)
</span><span class="cx"> {
</span><span class="cx"> return PerThread<Cache>::getSlowCase()->allocator().allocate(size);
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Cache.h (181328 => 181329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Cache.h 2015-03-10 17:55:21 UTC (rev 181328)
+++ trunk/Source/bmalloc/bmalloc/Cache.h 2015-03-10 18:00:59 UTC (rev 181329)
</span><span class="lines">@@ -39,10 +39,12 @@
</span><span class="cx"> void* operator new(size_t);
</span><span class="cx"> void operator delete(void*, size_t);
</span><span class="cx">
</span><ins>+ static void* tryAllocate(size_t);
</ins><span class="cx"> static void* allocate(size_t);
</span><span class="cx"> static void* allocate(size_t alignment, size_t);
</span><span class="cx"> static void deallocate(void*);
</span><span class="cx"> static void* reallocate(void*, size_t);
</span><ins>+
</ins><span class="cx"> static void scavenge();
</span><span class="cx">
</span><span class="cx"> Cache();
</span><span class="lines">@@ -51,6 +53,7 @@
</span><span class="cx"> Deallocator& deallocator() { return m_deallocator; }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ static void* tryAllocateSlowCaseNullCache(size_t);
</ins><span class="cx"> static void* allocateSlowCaseNullCache(size_t);
</span><span class="cx"> static void* allocateSlowCaseNullCache(size_t alignment, size_t);
</span><span class="cx"> static void deallocateSlowCaseNullCache(void*);
</span><span class="lines">@@ -60,6 +63,14 @@
</span><span class="cx"> Allocator m_allocator;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+inline void* Cache::tryAllocate(size_t size)
+{
+ Cache* cache = PerThread<Cache>::getFastCase();
+ if (!cache)
+ return tryAllocateSlowCaseNullCache(size);
+ return cache->allocator().tryAllocate(size);
+}
+
</ins><span class="cx"> inline void* Cache::allocate(size_t size)
</span><span class="cx"> {
</span><span class="cx"> Cache* cache = PerThread<Cache>::getFastCase();
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Heap.cpp (181328 => 181329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Heap.cpp 2015-03-10 17:55:21 UTC (rev 181328)
+++ trunk/Source/bmalloc/bmalloc/Heap.cpp 2015-03-10 18:00:59 UTC (rev 181329)
</span><span class="lines">@@ -281,14 +281,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void* Heap::allocateXLarge(std::lock_guard<StaticMutex>&, size_t alignment, size_t size)
</del><ins>+void* Heap::allocateXLarge(std::lock_guard<StaticMutex>& lock, size_t alignment, size_t size)
</ins><span class="cx"> {
</span><del>- BASSERT(isPowerOfTwo(alignment));
- BASSERT(alignment >= xLargeAlignment);
- BASSERT(size == roundUpToMultipleOf<xLargeAlignment>(size));
-
- void* result = vmAllocate(alignment, size);
- m_xLargeObjects.push(Range(result, size));
</del><ins>+ void* result = tryAllocateXLarge(lock, alignment, size);
+ RELEASE_BASSERT(result);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -297,6 +293,19 @@
</span><span class="cx"> return allocateXLarge(lock, superChunkSize, size);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void* Heap::tryAllocateXLarge(std::lock_guard<StaticMutex>&, size_t alignment, size_t size)
+{
+ BASSERT(isPowerOfTwo(alignment));
+ BASSERT(alignment >= superChunkSize);
+ BASSERT(size == roundUpToMultipleOf<xLargeAlignment>(size));
+
+ void* result = tryVMAllocate(alignment, size);
+ if (!result)
+ return nullptr;
+ m_xLargeObjects.push(Range(result, size));
+ return result;
+}
+
</ins><span class="cx"> Range Heap::findXLarge(std::lock_guard<StaticMutex>&, void* object)
</span><span class="cx"> {
</span><span class="cx"> for (auto& range : m_xLargeObjects) {
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Heap.h (181328 => 181329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Heap.h 2015-03-10 17:55:21 UTC (rev 181328)
+++ trunk/Source/bmalloc/bmalloc/Heap.h 2015-03-10 18:00:59 UTC (rev 181329)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx">
</span><span class="cx"> void* allocateXLarge(std::lock_guard<StaticMutex>&, size_t);
</span><span class="cx"> void* allocateXLarge(std::lock_guard<StaticMutex>&, size_t alignment, size_t);
</span><ins>+ void* tryAllocateXLarge(std::lock_guard<StaticMutex>&, size_t alignment, size_t);
</ins><span class="cx"> Range findXLarge(std::lock_guard<StaticMutex>&, void*);
</span><span class="cx"> void deallocateXLarge(std::unique_lock<StaticMutex>&, void*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocVMAllocateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/VMAllocate.h (181328 => 181329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/VMAllocate.h 2015-03-10 17:55:21 UTC (rev 181328)
+++ trunk/Source/bmalloc/bmalloc/VMAllocate.h 2015-03-10 18:00:59 UTC (rev 181329)
</span><span class="lines">@@ -73,14 +73,22 @@
</span><span class="cx"> BASSERT(p == mask(p, ~(getpagesize() - 1)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void* vmAllocate(size_t vmSize)
</del><ins>+inline void* tryVMAllocate(size_t vmSize)
</ins><span class="cx"> {
</span><span class="cx"> vmValidate(vmSize);
</span><span class="cx"> void* result = mmap(0, vmSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, BMALLOC_VM_TAG, 0);
</span><del>- RELEASE_BASSERT(result != MAP_FAILED);
</del><ins>+ if (result == MAP_FAILED)
+ return nullptr;
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void* vmAllocate(size_t vmSize)
+{
+ void* result = tryVMAllocate(vmSize);
+ RELEASE_BASSERT(result);
+ return result;
+}
+
</ins><span class="cx"> inline void vmDeallocate(void* p, size_t vmSize)
</span><span class="cx"> {
</span><span class="cx"> vmValidate(p, vmSize);
</span><span class="lines">@@ -90,13 +98,15 @@
</span><span class="cx"> // Allocates vmSize bytes at a specified power-of-two alignment.
</span><span class="cx"> // Use this function to create maskable memory regions.
</span><span class="cx">
</span><del>-inline void* vmAllocate(size_t vmAlignment, size_t vmSize)
</del><ins>+inline void* tryVMAllocate(size_t vmAlignment, size_t vmSize)
</ins><span class="cx"> {
</span><span class="cx"> vmValidate(vmSize);
</span><span class="cx"> vmValidate(vmAlignment);
</span><span class="cx">
</span><span class="cx"> size_t mappedSize = std::max(vmSize, vmAlignment) + vmAlignment;
</span><del>- char* mapped = static_cast<char*>(vmAllocate(mappedSize));
</del><ins>+ char* mapped = static_cast<char*>(tryVMAllocate(mappedSize));
+ if (!mapped)
+ return nullptr;
</ins><span class="cx"> char* mappedEnd = mapped + mappedSize;
</span><span class="cx">
</span><span class="cx"> char* aligned = roundUpToMultipleOf(vmAlignment, mapped);
</span><span class="lines">@@ -111,6 +121,13 @@
</span><span class="cx"> return aligned;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void* vmAllocate(size_t vmAlignment, size_t vmSize)
+{
+ void* result = tryVMAllocate(vmAlignment, vmSize);
+ RELEASE_BASSERT(result);
+ return result;
+}
+
</ins><span class="cx"> inline void vmDeallocatePhysicalPages(void* p, size_t vmSize)
</span><span class="cx"> {
</span><span class="cx"> vmValidate(p, vmSize);
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocbmalloch"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/bmalloc.h (181328 => 181329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/bmalloc.h 2015-03-10 17:55:21 UTC (rev 181328)
+++ trunk/Source/bmalloc/bmalloc/bmalloc.h 2015-03-10 18:00:59 UTC (rev 181329)
</span><span class="lines">@@ -31,24 +31,33 @@
</span><span class="cx"> namespace bmalloc {
</span><span class="cx"> namespace api {
</span><span class="cx">
</span><ins>+// Returns null on failure.
+inline void* tryMalloc(size_t size)
+{
+ return Cache::tryAllocate(size);
+}
+
+// Crashes on failure.
</ins><span class="cx"> inline void* malloc(size_t size)
</span><span class="cx"> {
</span><span class="cx"> return Cache::allocate(size);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Crashes on failure.
</ins><span class="cx"> inline void* memalign(size_t alignment, size_t size)
</span><span class="cx"> {
</span><span class="cx"> return Cache::allocate(alignment, size);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void free(void* object)
</del><ins>+// Crashes on failure.
+inline void* realloc(void* object, size_t newSize)
</ins><span class="cx"> {
</span><del>- Cache::deallocate(object);
</del><ins>+ return Cache::reallocate(object, newSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline void* realloc(void* object, size_t newSize)
</del><ins>+inline void free(void* object)
</ins><span class="cx"> {
</span><del>- return Cache::reallocate(object, newSize);
</del><ins>+ Cache::deallocate(object);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void scavengeThisThread()
</span></span></pre>
</div>
</div>
</body>
</html>