<!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>[152980] trunk/dports/devel/jemalloc</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="https://trac.macports.org/changeset/152980">152980</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2016-09-21 11:29:02 -0700 (Wed, 21 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>jemalloc: Fix malloc zone registration on Sierra
Closes: #52238</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdeveljemallocPortfile">trunk/dports/devel/jemalloc/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/devel/jemalloc/files/</li>
<li><a href="#trunkdportsdeveljemallocfiles0001Avoidgettingthesamedefaultzonetwiceinarowpatch">trunk/dports/devel/jemalloc/files/0001-Avoid-getting-the-same-default-zone-twice-in-a-row.patch</a></li>
<li><a href="#trunkdportsdeveljemallocfiles0002Changehowthedefaultzoneisfoundpatch">trunk/dports/devel/jemalloc/files/0002-Change-how-the-default-zone-is-found.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdeveljemallocPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/jemalloc/Portfile (152979 => 152980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/jemalloc/Portfile 2016-09-21 18:25:32 UTC (rev 152979)
+++ trunk/dports/devel/jemalloc/Portfile 2016-09-21 18:29:02 UTC (rev 152980)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> name jemalloc
</span><span class="cx"> categories devel
</span><span class="cx"> version 4.2.1
</span><ins>+revision 1
</ins><span class="cx"> license BSD
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers gmail.com:yoanlin93 openmaintainer
</span><span class="lines">@@ -24,6 +25,13 @@
</span><span class="cx">
</span><span class="cx"> depends_build port:libxslt
</span><span class="cx">
</span><ins>+# https://trac.macports.org/ticket/52238
+# https://github.com/jemalloc/jemalloc/commit/4abaee5
+# https://github.com/jemalloc/jemalloc/commit/19c9a3e
+patch.pre_args -p1
+patchfiles 0001-Avoid-getting-the-same-default-zone-twice-in-a-row.patch \
+ 0002-Change-how-the-default-zone-is-found.patch
+
</ins><span class="cx"> configure.args-append --disable-debug --with-jemalloc-prefix=
</span><span class="cx">
</span><span class="cx"> # provide a compatibility symlink with the older name
</span></span></pre></div>
<a id="trunkdportsdeveljemallocfiles0001Avoidgettingthesamedefaultzonetwiceinarowpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/jemalloc/files/0001-Avoid-getting-the-same-default-zone-twice-in-a-row.patch (0 => 152980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/jemalloc/files/0001-Avoid-getting-the-same-default-zone-twice-in-a-row.patch (rev 0)
+++ trunk/dports/devel/jemalloc/files/0001-Avoid-getting-the-same-default-zone-twice-in-a-row.patch 2016-09-21 18:29:02 UTC (rev 152980)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+From 4abaee5d13a54c677cd132c481dbf7621f785fec Mon Sep 17 00:00:00 2001
+From: Mike Hommey <mh@glandium.org>
+Date: Fri, 8 Jul 2016 13:28:16 +0900
+Subject: [PATCH 1/2] Avoid getting the same default zone twice in a row.
+
+847ff22 added a call to malloc_default_zone() before the main loop in
+register_zone, effectively making malloc_default_zone() called twice
+without any different outcome expected in the returned result.
+
+It is also called once at the beginning, and a second time at the end
+of the loop block.
+
+Instead, call it only once per iteration.
+---
+ src/zone.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/zone.c b/src/zone.c
+index ca235da..9432f45 100644
+--- a/src/zone.c
++++ b/src/zone.c
+@@ -246,7 +246,6 @@ register_zone(void)
+ malloc_zone_register(&zone);
+
+ do {
+- default_zone = malloc_default_zone();
+ /*
+ * Unregister and reregister the default zone. On OSX >= 10.6,
+ * unregistering takes the last registered zone and places it
+@@ -272,5 +271,7 @@ register_zone(void)
+ malloc_zone_unregister(purgeable_zone);
+ malloc_zone_register(purgeable_zone);
+ }
+- } while (malloc_default_zone() != &zone);
++
++ default_zone = malloc_default_zone();
++ } while (default_zone != &zone);
+ }
+--
+2.9.3
+
</ins></span></pre></div>
<a id="trunkdportsdeveljemallocfiles0002Changehowthedefaultzoneisfoundpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/jemalloc/files/0002-Change-how-the-default-zone-is-found.patch (0 => 152980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/jemalloc/files/0002-Change-how-the-default-zone-is-found.patch (rev 0)
+++ trunk/dports/devel/jemalloc/files/0002-Change-how-the-default-zone-is-found.patch 2016-09-21 18:29:02 UTC (rev 152980)
</span><span class="lines">@@ -0,0 +1,76 @@
</span><ins>+From 19c9a3e828ed46f1576521c264640e60bd0cb01f Mon Sep 17 00:00:00 2001
+From: Mike Hommey <mh@glandium.org>
+Date: Fri, 8 Jul 2016 13:35:35 +0900
+Subject: [PATCH 2/2] Change how the default zone is found
+
+On OSX 10.12, malloc_default_zone returns a special zone that is not
+present in the list of registered zones. That zone uses a "lite zone"
+if one is present (apparently enabled when malloc stack logging is
+enabled), or the first registered zone otherwise. In practice this
+means unless malloc stack logging is enabled, the first registered
+zone is the default.
+
+So get the list of zones to get the first one, instead of relying on
+malloc_default_zone.
+---
+ src/zone.c | 31 +++++++++++++++++++++++++++++--
+ 1 file changed, 29 insertions(+), 2 deletions(-)
+
+diff --git a/src/zone.c b/src/zone.c
+index 9432f45..9238161 100644
+--- a/src/zone.c
++++ b/src/zone.c
+@@ -168,6 +168,33 @@ zone_force_unlock(malloc_zone_t *zone)
+ jemalloc_postfork_parent();
+ }
+
++static malloc_zone_t *get_default_zone()
++{
++ malloc_zone_t **zones = NULL;
++ unsigned int num_zones = 0;
++
++ /*
++ * On OSX 10.12, malloc_default_zone returns a special zone that is not
++ * present in the list of registered zones. That zone uses a "lite zone"
++ * if one is present (apparently enabled when malloc stack logging is
++ * enabled), or the first registered zone otherwise. In practice this
++ * means unless malloc stack logging is enabled, the first registered
++ * zone is the default.
++ * So get the list of zones to get the first one, instead of relying on
++ * malloc_default_zone.
++ */
++ if (KERN_SUCCESS != malloc_get_all_zones(0, NULL, (vm_address_t**) &zones,
++ &num_zones)) {
++ /* Reset the value in case the failure happened after it was set. */
++ num_zones = 0;
++ }
++
++ if (num_zones)
++ return zones[0];
++
++ return malloc_default_zone();
++}
++
+ JEMALLOC_ATTR(constructor)
+ void
+ register_zone(void)
+@@ -177,7 +204,7 @@ register_zone(void)
+ * If something else replaced the system default zone allocator, don't
+ * register jemalloc's.
+ */
+- malloc_zone_t *default_zone = malloc_default_zone();
++ malloc_zone_t *default_zone = get_default_zone();
+ malloc_zone_t *purgeable_zone = NULL;
+ if (!default_zone->zone_name ||
+ strcmp(default_zone->zone_name, "DefaultMallocZone") != 0) {
+@@ -272,6 +299,6 @@ register_zone(void)
+ malloc_zone_register(purgeable_zone);
+ }
+
+- default_zone = malloc_default_zone();
++ default_zone = get_default_zone();
+ } while (default_zone != &zone);
+ }
+--
+2.9.3
+
</ins></span></pre>
</div>
</div>
</body>
</html>