<!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>[177317] 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/177317">177317</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2014-12-15 15:40:06 -0800 (Mon, 15 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Safari crashes when you set Malloc environment variables
https://bugs.webkit.org/show_bug.cgi?id=139656
Reviewed by Michael Saboff.
I forgot to cover the realloc() case. Whoops. (OoPS?)
This time around, I ran the full MallocBench test suite in Malloc=1
mode, and it passed.
* bmalloc/Allocator.cpp:
(bmalloc::Allocator::reallocate):
* bmalloc/Allocator.h: Pushed realloc() logic down into the allocator.
It needs to be down there so that we can do the short-circuiting check
for whether bmalloc is enabled first.
Also added the check.
* bmalloc/Cache.cpp:
(bmalloc::Cache::scavenge):
(bmalloc::Cache::Cache):
(bmalloc::Cache::reallocateSlowCaseNullCache):
* bmalloc/Cache.h:
(bmalloc::Cache::deallocator):
(bmalloc::Cache::reallocate): Ditto.
* bmalloc/bmalloc.h:
(bmalloc::api::free):
(bmalloc::api::realloc): Ditto.
(bmalloc::api::scavenge): Pushed this down into Cache to match the
surrounding functions.</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="#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="#trunkSourcebmallocbmallocbmalloch">trunk/Source/bmalloc/bmalloc/bmalloc.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (177316 => 177317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2014-12-15 23:24:12 UTC (rev 177316)
+++ trunk/Source/bmalloc/ChangeLog 2014-12-15 23:40:06 UTC (rev 177317)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-12-15 Geoffrey Garen <ggaren@apple.com>
+
+ Safari crashes when you set Malloc environment variables
+ https://bugs.webkit.org/show_bug.cgi?id=139656
+
+ Reviewed by Michael Saboff.
+
+ I forgot to cover the realloc() case. Whoops. (OoPS?)
+
+ This time around, I ran the full MallocBench test suite in Malloc=1
+ mode, and it passed.
+
+ * bmalloc/Allocator.cpp:
+ (bmalloc::Allocator::reallocate):
+ * bmalloc/Allocator.h: Pushed realloc() logic down into the allocator.
+ It needs to be down there so that we can do the short-circuiting check
+ for whether bmalloc is enabled first.
+
+ Also added the check.
+
+ * bmalloc/Cache.cpp:
+ (bmalloc::Cache::scavenge):
+ (bmalloc::Cache::Cache):
+ (bmalloc::Cache::reallocateSlowCaseNullCache):
+ * bmalloc/Cache.h:
+ (bmalloc::Cache::deallocator):
+ (bmalloc::Cache::reallocate): Ditto.
+
+ * bmalloc/bmalloc.h:
+ (bmalloc::api::free):
+ (bmalloc::api::realloc): Ditto.
+
+ (bmalloc::api::scavenge): Pushed this down into Cache to match the
+ surrounding functions.
+
</ins><span class="cx"> 2014-12-11 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> bmalloc should support system memory analysis tools (part 2)
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocAllocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Allocator.cpp (177316 => 177317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Allocator.cpp 2014-12-15 23:24:12 UTC (rev 177316)
+++ trunk/Source/bmalloc/bmalloc/Allocator.cpp 2014-12-15 23:40:06 UTC (rev 177317)
</span><span class="lines">@@ -27,8 +27,10 @@
</span><span class="cx"> #include "BAssert.h"
</span><span class="cx"> #include "Deallocator.h"
</span><span class="cx"> #include "Heap.h"
</span><ins>+#include "LargeChunk.h"
</ins><span class="cx"> #include "PerProcess.h"
</span><span class="cx"> #include "Sizes.h"
</span><ins>+#include "XLargeChunk.h"
</ins><span class="cx"> #include <algorithm>
</span><span class="cx"> #include <cstdlib>
</span><span class="cx">
</span><span class="lines">@@ -49,6 +51,45 @@
</span><span class="cx"> scavenge();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void* Allocator::reallocate(void* object, size_t newSize)
+{
+ if (!m_isBmallocEnabled)
+ return realloc(object, newSize);
+
+ void* result = allocate(newSize);
+ if (!object)
+ return result;
+
+ size_t oldSize = 0;
+ switch (objectType(object)) {
+ case Small: {
+ SmallPage* page = SmallPage::get(SmallLine::get(object));
+ oldSize = objectSize(page->sizeClass());
+ break;
+ }
+ case Medium: {
+ MediumPage* page = MediumPage::get(MediumLine::get(object));
+ oldSize = objectSize(page->sizeClass());
+ break;
+ }
+ case Large: {
+ BeginTag* beginTag = LargeChunk::beginTag(object);
+ oldSize = beginTag->size();
+ break;
+ }
+ case XLarge: {
+ XLargeChunk* chunk = XLargeChunk::get(object);
+ oldSize = chunk->size();
+ break;
+ }
+ }
+
+ size_t copySize = std::min(oldSize, newSize);
+ memcpy(result, object, copySize);
+ m_deallocator.deallocate(object);
+ return result;
+}
+
</ins><span class="cx"> void Allocator::scavenge()
</span><span class="cx"> {
</span><span class="cx"> for (unsigned short i = alignment; i <= mediumMax; i += alignment) {
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Allocator.h (177316 => 177317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Allocator.h 2014-12-15 23:24:12 UTC (rev 177316)
+++ trunk/Source/bmalloc/bmalloc/Allocator.h 2014-12-15 23:40:06 UTC (rev 177317)
</span><span class="lines">@@ -42,6 +42,8 @@
</span><span class="cx"> ~Allocator();
</span><span class="cx">
</span><span class="cx"> void* allocate(size_t);
</span><ins>+ void* reallocate(void*, size_t);
+
</ins><span class="cx"> void scavenge();
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Cache.cpp (177316 => 177317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Cache.cpp 2014-12-15 23:24:12 UTC (rev 177316)
+++ trunk/Source/bmalloc/bmalloc/Cache.cpp 2014-12-15 23:40:06 UTC (rev 177317)
</span><span class="lines">@@ -40,17 +40,24 @@
</span><span class="cx"> vmDeallocate(p, vmSize(size));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Cache::scavenge()
+{
+ Cache* cache = PerThread<Cache>::getFastCase();
+ if (!cache)
+ return;
+
+ cache->allocator().scavenge();
+ cache->deallocator().scavenge();
+
+ std::unique_lock<StaticMutex> lock(PerProcess<Heap>::mutex());
+ PerProcess<Heap>::get()->scavenge(lock, std::chrono::milliseconds(0));
+}
+
</ins><span class="cx"> Cache::Cache()
</span><span class="cx"> : m_deallocator(PerProcess<Heap>::get())
</span><span class="cx"> , m_allocator(PerProcess<Heap>::get(), m_deallocator)
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>-
-void Cache::scavenge()
-{
- m_allocator.scavenge();
- m_deallocator.scavenge();
-}
</del><span class="cx">
</span><span class="cx"> NO_INLINE void* Cache::allocateSlowCaseNullCache(size_t size)
</span><span class="cx"> {
</span><span class="lines">@@ -62,4 +69,9 @@
</span><span class="cx"> PerThread<Cache>::getSlowCase()->deallocator().deallocate(object);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+NO_INLINE void* Cache::reallocateSlowCaseNullCache(void* object, size_t newSize)
+{
+ return PerThread<Cache>::getSlowCase()->allocator().reallocate(object, newSize);
+}
+
</ins><span class="cx"> } // namespace bmalloc
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Cache.h (177316 => 177317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Cache.h 2014-12-15 23:24:12 UTC (rev 177316)
+++ trunk/Source/bmalloc/bmalloc/Cache.h 2014-12-15 23:40:06 UTC (rev 177317)
</span><span class="lines">@@ -41,17 +41,18 @@
</span><span class="cx">
</span><span class="cx"> static void* allocate(size_t);
</span><span class="cx"> static void deallocate(void*);
</span><ins>+ static void* reallocate(void*, size_t);
+ static void scavenge();
</ins><span class="cx">
</span><span class="cx"> Cache();
</span><span class="cx">
</span><span class="cx"> Allocator& allocator() { return m_allocator; }
</span><span class="cx"> Deallocator& deallocator() { return m_deallocator; }
</span><del>-
- void scavenge();
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static void* allocateSlowCaseNullCache(size_t);
</span><span class="cx"> static void deallocateSlowCaseNullCache(void*);
</span><ins>+ static void* reallocateSlowCaseNullCache(void*, size_t);
</ins><span class="cx">
</span><span class="cx"> Deallocator m_deallocator;
</span><span class="cx"> Allocator m_allocator;
</span><span class="lines">@@ -73,6 +74,14 @@
</span><span class="cx"> return cache->deallocator().deallocate(object);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void* Cache::reallocate(void* object, size_t newSize)
+{
+ Cache* cache = PerThread<Cache>::getFastCase();
+ if (!cache)
+ return reallocateSlowCaseNullCache(object, newSize);
+ return cache->allocator().reallocate(object, newSize);
+}
+
</ins><span class="cx"> } // namespace bmalloc
</span><span class="cx">
</span><span class="cx"> #endif // Cache_h
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocbmalloch"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/bmalloc.h (177316 => 177317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/bmalloc.h 2014-12-15 23:24:12 UTC (rev 177316)
+++ trunk/Source/bmalloc/bmalloc/bmalloc.h 2014-12-15 23:40:06 UTC (rev 177317)
</span><span class="lines">@@ -24,11 +24,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "Cache.h"
</span><del>-#include "Heap.h"
-#include "LargeChunk.h"
-#include "PerProcess.h"
-#include "XLargeChunk.h"
-#include "Sizes.h"
</del><span class="cx">
</span><span class="cx"> namespace bmalloc {
</span><span class="cx"> namespace api {
</span><span class="lines">@@ -40,51 +35,17 @@
</span><span class="cx">
</span><span class="cx"> inline void free(void* object)
</span><span class="cx"> {
</span><del>- return Cache::deallocate(object);
</del><ins>+ Cache::deallocate(object);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void* realloc(void* object, size_t newSize)
</span><span class="cx"> {
</span><del>- void* result = Cache::allocate(newSize);
- if (!object)
- return result;
-
- size_t oldSize = 0;
- switch(objectType(object)) {
- case Small: {
- SmallPage* page = SmallPage::get(SmallLine::get(object));
- oldSize = objectSize(page->sizeClass());
- break;
- }
- case Medium: {
- MediumPage* page = MediumPage::get(MediumLine::get(object));
- oldSize = objectSize(page->sizeClass());
- break;
- }
- case Large: {
- BeginTag* beginTag = LargeChunk::beginTag(object);
- oldSize = beginTag->size();
- break;
- }
- case XLarge: {
- XLargeChunk* chunk = XLargeChunk::get(object);
- oldSize = chunk->size();
- break;
- }
- }
-
- size_t copySize = std::min(oldSize, newSize);
- memcpy(result, object, copySize);
- Cache::deallocate(object);
- return result;
</del><ins>+ return Cache::reallocate(object, newSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void scavenge()
</span><span class="cx"> {
</span><del>- PerThread<Cache>::get()->scavenge();
-
- std::unique_lock<StaticMutex> lock(PerProcess<Heap>::mutex());
- PerProcess<Heap>::get()->scavenge(lock, std::chrono::milliseconds(0));
</del><ins>+ Cache::scavenge();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace api
</span></span></pre>
</div>
</div>
</body>
</html>