<!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>[187360] 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/187360">187360</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-07-24 14:03:09 -0700 (Fri, 24 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>JavaScriptCore bmalloc should not register its malloc zone more than once
https://bugs.webkit.org/show_bug.cgi?id=147273
Reviewed by Andreas Kling.
This was a goof: The Zone constructor, by virtue of running automatically,
was registering a Zone inside the analysis process.
* bmalloc/Zone.cpp:
(bmalloc::remoteRead): Clarify that the pointer is remote.
(bmalloc::enumerator):
(bmalloc::Zone::Zone):
* bmalloc/Zone.h: Separate the normal constructor and the remote constructor.
The remote constructor skips zone registration since its goal is not
to register a zone in the current process or do any allocation but rather
to mirror the bytes of the zone from the target process.</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 (187359 => 187360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2015-07-24 20:41:25 UTC (rev 187359)
+++ trunk/Source/bmalloc/ChangeLog 2015-07-24 21:03:09 UTC (rev 187360)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-07-24 Geoffrey Garen <ggaren@apple.com>
+
+ JavaScriptCore bmalloc should not register its malloc zone more than once
+ https://bugs.webkit.org/show_bug.cgi?id=147273
+
+ Reviewed by Andreas Kling.
+
+ This was a goof: The Zone constructor, by virtue of running automatically,
+ was registering a Zone inside the analysis process.
+
+ * bmalloc/Zone.cpp:
+ (bmalloc::remoteRead): Clarify that the pointer is remote.
+
+ (bmalloc::enumerator):
+ (bmalloc::Zone::Zone):
+ * bmalloc/Zone.h: Separate the normal constructor and the remote constructor.
+ The remote constructor skips zone registration since its goal is not
+ to register a zone in the current process or do any allocation but rather
+ to mirror the bytes of the zone from the target process.
+
</ins><span class="cx"> 2015-07-23 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> bmalloc: Shrink the super chunk size (again)
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocZonecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Zone.cpp (187359 => 187360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Zone.cpp 2015-07-24 20:41:25 UTC (rev 187359)
+++ trunk/Source/bmalloc/bmalloc/Zone.cpp 2015-07-24 21:03:09 UTC (rev 187360)
</span><span class="lines">@@ -28,10 +28,10 @@
</span><span class="cx">
</span><span class="cx"> namespace bmalloc {
</span><span class="cx">
</span><del>-template<typename T> static void remoteRead(task_t task, memory_reader_t reader, vm_address_t pointer, T& result)
</del><ins>+template<typename T> static void remoteRead(task_t task, memory_reader_t reader, vm_address_t remotePointer, T& result)
</ins><span class="cx"> {
</span><span class="cx"> void* tmp;
</span><del>- (*reader)(task, pointer, sizeof(T), &tmp);
</del><ins>+ (*reader)(task, remotePointer, sizeof(T), &tmp);
</ins><span class="cx"> memcpy(&result, tmp, sizeof(T));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -79,9 +79,7 @@
</span><span class="cx"> // This function runs inside the leaks process.
</span><span class="cx"> 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)
</span><span class="cx"> {
</span><del>- Zone remoteZone;
- remoteRead(task, reader, zone_address, remoteZone);
-
</del><ins>+ Zone remoteZone(task, reader, zone_address);
</ins><span class="cx"> for (auto* superChunk : remoteZone.superChunks()) {
</span><span class="cx"> vm_range_t range = { reinterpret_cast<vm_address_t>(superChunk), superChunkSize };
</span><span class="cx">
</span><span class="lines">@@ -118,4 +116,9 @@
</span><span class="cx"> malloc_zone_register(this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Zone::Zone(task_t task, memory_reader_t reader, vm_address_t remotePointer)
+{
+ remoteRead(task, reader, remotePointer, *this);
+}
+
</ins><span class="cx"> } // namespace bmalloc
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocZoneh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Zone.h (187359 => 187360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Zone.h 2015-07-24 20:41:25 UTC (rev 187359)
+++ trunk/Source/bmalloc/bmalloc/Zone.h 2015-07-24 21:03:09 UTC (rev 187360)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> static const size_t capacity = 2048;
</span><span class="cx">
</span><span class="cx"> Zone();
</span><ins>+ Zone(task_t, memory_reader_t, vm_address_t);
</ins><span class="cx">
</span><span class="cx"> void addSuperChunk(SuperChunk*);
</span><span class="cx"> FixedVector<SuperChunk*, capacity>& superChunks() { return m_superChunks; }
</span></span></pre>
</div>
</div>
</body>
</html>