<!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>[177191] 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/177191">177191</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2014-12-11 16:22:41 -0800 (Thu, 11 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>bmalloc should support system memory analysis tools (part 2)
https://bugs.webkit.org/show_bug.cgi?id=139565
Reviewed by Mark Lam.
This patch actually queries the environment to see if memory analysis
tools have been enabled.
* bmalloc/Deallocator.cpp:
(bmalloc::Deallocator::scavenge): Don't process the object log if
we've disabled bmalloc because it will be full of invalid nullptrs.
* bmalloc/Environment.cpp:
(bmalloc::isMallocEnvironmentVariableSet): Test for the list of known
Malloc debugging flags. I also added a plain "Malloc" catch-all for
when you want to disable bmalloc without enabling any kind of funny
business.
It would be slightly nicer just to iterate the list of environment
variables and strstr them, but getenv is the more portable option,
and performance here doesn't really matter.
(bmalloc::isLibgmallocEnabled): Test for the libgmalloc insertion
environment variable.
(bmalloc::Environment::computeIsBmallocEnabled):</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="#trunkSourcebmallocbmallocDeallocatorcpp">trunk/Source/bmalloc/bmalloc/Deallocator.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocEnvironmentcpp">trunk/Source/bmalloc/bmalloc/Environment.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocRangeh">trunk/Source/bmalloc/bmalloc/Range.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (177190 => 177191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2014-12-12 00:18:09 UTC (rev 177190)
+++ trunk/Source/bmalloc/ChangeLog 2014-12-12 00:22:41 UTC (rev 177191)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2014-12-11 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><ins>+ bmalloc should support system memory analysis tools (part 2)
+ https://bugs.webkit.org/show_bug.cgi?id=139565
+
+ Reviewed by Mark Lam.
+
+ This patch actually queries the environment to see if memory analysis
+ tools have been enabled.
+
+ * bmalloc/Deallocator.cpp:
+ (bmalloc::Deallocator::scavenge): Don't process the object log if
+ we've disabled bmalloc because it will be full of invalid nullptrs.
+
+ * bmalloc/Environment.cpp:
+ (bmalloc::isMallocEnvironmentVariableSet): Test for the list of known
+ Malloc debugging flags. I also added a plain "Malloc" catch-all for
+ when you want to disable bmalloc without enabling any kind of funny
+ business.
+
+ It would be slightly nicer just to iterate the list of environment
+ variables and strstr them, but getenv is the more portable option,
+ and performance here doesn't really matter.
+
+ (bmalloc::isLibgmallocEnabled): Test for the libgmalloc insertion
+ environment variable.
+
+ (bmalloc::Environment::computeIsBmallocEnabled):
+
+2014-12-11 Geoffrey Garen <ggaren@apple.com>
+
</ins><span class="cx"> Try to fix the iOS simulator build.
</span><span class="cx">
</span><span class="cx"> #include the declaration of malloc / free.
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocAllocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Allocator.cpp (177190 => 177191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Allocator.cpp 2014-12-12 00:18:09 UTC (rev 177190)
+++ trunk/Source/bmalloc/bmalloc/Allocator.cpp 2014-12-12 00:22:41 UTC (rev 177191)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "PerProcess.h"
</span><span class="cx"> #include "Sizes.h"
</span><span class="cx"> #include <algorithm>
</span><del>-#include <stdlib.h>
</del><ins>+#include <cstdlib>
</ins><span class="cx">
</span><span class="cx"> using namespace std;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocDeallocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Deallocator.cpp (177190 => 177191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Deallocator.cpp 2014-12-12 00:18:09 UTC (rev 177190)
+++ trunk/Source/bmalloc/bmalloc/Deallocator.cpp 2014-12-12 00:22:41 UTC (rev 177191)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include "PerProcess.h"
</span><span class="cx"> #include "SmallChunk.h"
</span><span class="cx"> #include <algorithm>
</span><del>-#include <stdlib.h>
</del><ins>+#include <cstdlib>
</ins><span class="cx"> #include <sys/mman.h>
</span><span class="cx">
</span><span class="cx"> using namespace std;
</span><span class="lines">@@ -56,7 +56,8 @@
</span><span class="cx">
</span><span class="cx"> void Deallocator::scavenge()
</span><span class="cx"> {
</span><del>- processObjectLog();
</del><ins>+ if (m_isBmallocEnabled)
+ processObjectLog();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Deallocator::deallocateLarge(void* object)
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocEnvironmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Environment.cpp (177190 => 177191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Environment.cpp 2014-12-12 00:18:09 UTC (rev 177190)
+++ trunk/Source/bmalloc/bmalloc/Environment.cpp 2014-12-12 00:22:41 UTC (rev 177191)
</span><span class="lines">@@ -24,9 +24,51 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "Environment.h"
</span><ins>+#include <cstdlib>
+#include <cstring>
</ins><span class="cx">
</span><span class="cx"> namespace bmalloc {
</span><span class="cx">
</span><ins>+static bool isMallocEnvironmentVariableSet()
+{
+ const char* list[] = {
+ "Malloc",
+ "MallocLogFile",
+ "MallocGuardEdges",
+ "MallocDoNotProtectPrelude",
+ "MallocDoNotProtectPostlude",
+ "MallocStackLogging",
+ "MallocStackLoggingNoCompact",
+ "MallocStackLoggingDirectory",
+ "MallocScribble",
+ "MallocCheckHeapStart",
+ "MallocCheckHeapEach",
+ "MallocCheckHeapSleep",
+ "MallocCheckHeapAbort",
+ "MallocErrorAbort",
+ "MallocCorruptionAbort",
+ "MallocHelp"
+ };
+ size_t size = sizeof(list) / sizeof(const char*);
+
+ for (size_t i = 0; i < size; ++i) {
+ if (getenv(list[i]))
+ return true;
+ }
+
+ return false;
+}
+
+static bool isLibgmallocEnabled()
+{
+ char* variable = getenv("DYLD_INSERT_LIBRARIES");
+ if (!variable)
+ return false;
+ if (!strstr(variable, "libgmalloc"))
+ return false;
+ return true;
+}
+
</ins><span class="cx"> Environment::Environment()
</span><span class="cx"> : m_isBmallocEnabled(computeIsBmallocEnabled())
</span><span class="cx"> {
</span><span class="lines">@@ -34,6 +76,10 @@
</span><span class="cx">
</span><span class="cx"> bool Environment::computeIsBmallocEnabled()
</span><span class="cx"> {
</span><ins>+ if (isMallocEnvironmentVariableSet())
+ return false;
+ if (isLibgmallocEnabled())
+ return false;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocRangeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Range.h (177190 => 177191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Range.h 2014-12-12 00:18:09 UTC (rev 177190)
+++ trunk/Source/bmalloc/bmalloc/Range.h 2014-12-12 00:22:41 UTC (rev 177191)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef Range_h
</span><span class="cx"> #define Range_h
</span><span class="cx">
</span><del>-#include <stddef.h>
</del><ins>+#include <cstddef>
</ins><span class="cx">
</span><span class="cx"> namespace bmalloc {
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>