<!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>[180958] 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/180958">180958</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-03-03 14:45:59 -0800 (Tue, 03 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>bmalloc: Added missing features to the malloc zone introspection API
https://bugs.webkit.org/show_bug.cgi?id=142235
Reviewed by Andreas Kling.
This should fix the crash we saw on the iOS PLT bot
(c.f. http://trac.webkit.org/changeset/180604).
* bmalloc/Zone.cpp:
(bmalloc::good_size):
(bmalloc::check):
(bmalloc::print):
(bmalloc::log):
(bmalloc::force_lock):
(bmalloc::force_unlock):
(bmalloc::statistics):
(bmalloc::size):
(bmalloc::enumerator): Provide all of these functions since they are called
indiscriminately on all zones.
(bmalloc::Zone::Zone):
(bmalloc::Zone::size): Deleted.
(bmalloc::Zone::enumerator): Deleted. Moved these functions out of the
Zone class since they can stand alone.
* bmalloc/Zone.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocZonecpp">trunk/Source/bmalloc/bmalloc/Zone.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocZoneh">trunk/Source/bmalloc/bmalloc/Zone.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (180957 => 180958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2015-03-03 22:43:34 UTC (rev 180957)
+++ trunk/Source/bmalloc/ChangeLog 2015-03-03 22:45:59 UTC (rev 180958)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2015-03-03 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><ins>+ bmalloc: Added missing features to the malloc zone introspection API
+ https://bugs.webkit.org/show_bug.cgi?id=142235
+
+ Reviewed by Andreas Kling.
+
+ This should fix the crash we saw on the iOS PLT bot
+ (c.f. http://trac.webkit.org/changeset/180604).
+
+ * bmalloc/Zone.cpp:
+ (bmalloc::good_size):
+ (bmalloc::check):
+ (bmalloc::print):
+ (bmalloc::log):
+ (bmalloc::force_lock):
+ (bmalloc::force_unlock):
+ (bmalloc::statistics):
+ (bmalloc::size):
+ (bmalloc::enumerator): Provide all of these functions since they are called
+ indiscriminately on all zones.
+
+ (bmalloc::Zone::Zone):
+ (bmalloc::Zone::size): Deleted.
+ (bmalloc::Zone::enumerator): Deleted. Moved these functions out of the
+ Zone class since they can stand alone.
+
+ * bmalloc/Zone.h:
+
+2015-03-03 Geoffrey Garen <ggaren@apple.com>
+
</ins><span class="cx"> bmalloc should implement malloc introspection (to stop false-positive leaks when MallocStackLogging is off)
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=141802
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocZonecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Zone.cpp (180957 => 180958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Zone.cpp 2015-03-03 22:43:34 UTC (rev 180957)
+++ trunk/Source/bmalloc/bmalloc/Zone.cpp 2015-03-03 22:45:59 UTC (rev 180958)
</span><span class="lines">@@ -28,13 +28,6 @@
</span><span class="cx">
</span><span class="cx"> namespace bmalloc {
</span><span class="cx">
</span><del>-// The memory analysis API requires the contents of this struct to be a static
-// constant in the program binary. The leaks process will load this struct
-// out of the program binary (and not out of the running process).
-static malloc_introspection_t introspect = {
- .enumerator = Zone::enumerator
-};
-
</del><span class="cx"> template<typename T> static void remoteRead(task_t task, memory_reader_t reader, vm_address_t pointer, T& result)
</span><span class="cx"> {
</span><span class="cx"> void* tmp;
</span><span class="lines">@@ -42,15 +35,49 @@
</span><span class="cx"> memcpy(&result, tmp, sizeof(T));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Support malloc_zone_from_ptr, which calls size() on each registered zone.
-size_t Zone::size(malloc_zone_t*, const void*)
</del><ins>+// These function pointers are invoked unconditionally on all zones by various
+// system tools. We don't support any of these features, but we provide
+// just enough functionality not to crash.
+
+static size_t good_size(malloc_zone_t*, size_t size)
</ins><span class="cx"> {
</span><ins>+ return size;
+}
+
+static boolean_t check(malloc_zone_t*)
+{
+ return true;
+}
+
+static void print(malloc_zone_t*, boolean_t)
+{
+}
+
+static void log(malloc_zone_t*, void*)
+{
+}
+
+static void force_lock(malloc_zone_t*)
+{
+}
+
+static void force_unlock(malloc_zone_t*)
+{
+}
+
+static void statistics(malloc_zone_t*, malloc_statistics_t* statistics)
+{
+ memset(statistics, 0, sizeof(malloc_statistics_t));
+}
+
+static size_t size(malloc_zone_t*, const void*)
+{
</ins><span class="cx"> // Our zone is not public API, so no pointer can belong to us.
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This function runs inside the leaks process.
</span><del>-kern_return_t Zone::enumerator(task_t task, void* context, unsigned type_mask, vm_address_t zone_address, memory_reader_t reader, vm_range_recorder_t recorder)
</del><ins>+static kern_return_t enumerator(task_t task, void* context, unsigned type_mask, vm_address_t zone_address, memory_reader_t reader, vm_range_recorder_t recorder)
</ins><span class="cx"> {
</span><span class="cx"> Zone remoteZone;
</span><span class="cx"> remoteRead(task, reader, zone_address, remoteZone);
</span><span class="lines">@@ -68,9 +95,23 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// The memory analysis API requires the contents of this struct to be a static
+// constant in the program binary. The leaks process will load this struct
+// out of the program binary (and not out of the running process).
+static malloc_introspection_t introspect = {
+ .enumerator = bmalloc::enumerator,
+ .good_size = bmalloc::good_size,
+ .check = bmalloc::check,
+ .print = bmalloc::print,
+ .log = bmalloc::log,
+ .force_lock = bmalloc::force_lock,
+ .force_unlock = bmalloc::force_unlock,
+ .statistics = bmalloc::statistics
+};
+
</ins><span class="cx"> Zone::Zone()
</span><span class="cx"> {
</span><del>- malloc_zone_t::size = size;
</del><ins>+ malloc_zone_t::size = &bmalloc::size;
</ins><span class="cx"> malloc_zone_t::zone_name = "WebKit Malloc";
</span><span class="cx"> malloc_zone_t::introspect = &bmalloc::introspect;
</span><span class="cx"> malloc_zone_t::version = 4;
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocZoneh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Zone.h (180957 => 180958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Zone.h 2015-03-03 22:43:34 UTC (rev 180957)
+++ trunk/Source/bmalloc/bmalloc/Zone.h 2015-03-03 22:45:59 UTC (rev 180958)
</span><span class="lines">@@ -38,9 +38,6 @@
</span><span class="cx"> // Enough capacity to track a 64GB heap, so probably enough for anything.
</span><span class="cx"> static const size_t capacity = 2048;
</span><span class="cx">
</span><del>- static size_t size(malloc_zone_t*, const void*);
- static kern_return_t enumerator(task_t, void* context, unsigned type_mask, vm_address_t, memory_reader_t, vm_range_recorder_t);
-
</del><span class="cx"> Zone();
</span><span class="cx">
</span><span class="cx"> void addSuperChunk(SuperChunk*);
</span></span></pre>
</div>
</div>
</body>
</html>