<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6ff376f0d6aa5225c9ba57e5448ee34d4926fbb3">https://github.com/macports/macports-ports/commit/6ff376f0d6aa5225c9ba57e5448ee34d4926fbb3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6ff376f0d6aa5225c9ba57e5448ee34d4926fbb3
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Oct 18 18:03:53 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> jemalloc: update version 4.2.1->5.0.1
</span>---
devel/jemalloc/Portfile | 25 ++-----
...ting-the-same-default-zone-twice-in-a-row.patch | 41 ------------
...0002-Change-how-the-default-zone-is-found.patch | 76 ----------------------
3 files changed, 7 insertions(+), 135 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jemalloc/Portfile b/devel/jemalloc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e5576e1..44b719e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/jemalloc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/jemalloc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name jemalloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.2.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup jemalloc jemalloc 5.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#revision 0
</span> license BSD
platforms darwin
maintainers gmail.com:yoanlin93 openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,23 +14,17 @@ long_description \
</span> jemalloc is a general-purpose scalable concurrent malloc(3) implementation.
homepage http://jemalloc.net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://www.canonware.com/download/jemalloc/
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 fdd50de876c8e78e14e4c75e54b3ed05b6fba1c0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5630650d5c1caab95d2f0898de4fe5ab8519dc680b04963b38bb425ef6a42d57
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f3e6fdbd4b5a00fde7de6a2d77c716a085b09943 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span>
#avoid configure: WARNING: unrecognized options: --disable-dependency-tracking
configure.universal_args-delete --disable-dependency-tracking
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/52238
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/jemalloc/jemalloc/commit/4abaee5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/jemalloc/jemalloc/commit/19c9a3e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles 0001-Avoid-getting-the-same-default-zone-twice-in-a-row.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-Change-how-the-default-zone-is-found.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append --disable-debug --with-jemalloc-prefix=
# provide a compatibility symlink with the older name
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +34,3 @@ post-destroot {
</span>
test.run yes
test.target check
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://www.canonware.com/download/jemalloc/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {jemalloc-([0-9]+\.[0-9.]+)\.tar\.}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jemalloc/files/0001-Avoid-getting-the-same-default-zone-twice-in-a-row.patch b/devel/jemalloc/files/0001-Avoid-getting-the-same-default-zone-twice-in-a-row.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b3e14e3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/jemalloc/files/0001-Avoid-getting-the-same-default-zone-twice-in-a-row.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,41 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 4abaee5d13a54c677cd132c481dbf7621f785fec Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Mike Hommey <mh@glandium.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 8 Jul 2016 13:28:16 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/2] Avoid getting the same default zone twice in a row.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-847ff22 added a call to malloc_default_zone() before the main loop in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-register_zone, effectively making malloc_default_zone() called twice
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-without any different outcome expected in the returned result.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-It is also called once at the beginning, and a second time at the end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-of the loop block.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Instead, call it only once per iteration.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/zone.c | 5 +++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 3 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/zone.c b/src/zone.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ca235da..9432f45 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/zone.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/zone.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -246,7 +246,6 @@ register_zone(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- malloc_zone_register(&zone);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- do {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- default_zone = malloc_default_zone();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Unregister and reregister the default zone. On OSX >= 10.6,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * unregistering takes the last registered zone and places it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -272,5 +271,7 @@ register_zone(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- malloc_zone_unregister(purgeable_zone);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- malloc_zone_register(purgeable_zone);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } while (malloc_default_zone() != &zone);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ default_zone = malloc_default_zone();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } while (default_zone != &zone);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jemalloc/files/0002-Change-how-the-default-zone-is-found.patch b/devel/jemalloc/files/0002-Change-how-the-default-zone-is-found.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 81c9809..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/jemalloc/files/0002-Change-how-the-default-zone-is-found.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,76 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 19c9a3e828ed46f1576521c264640e60bd0cb01f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Mike Hommey <mh@glandium.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 8 Jul 2016 13:35:35 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/2] Change how the default zone is found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-On OSX 10.12, malloc_default_zone returns a special zone that is not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-present in the list of registered zones. That zone uses a "lite zone"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if one is present (apparently enabled when malloc stack logging is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-enabled), or the first registered zone otherwise. In practice this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-means unless malloc stack logging is enabled, the first registered
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-zone is the default.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-So get the list of zones to get the first one, instead of relying on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-malloc_default_zone.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/zone.c | 31 +++++++++++++++++++++++++++++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 29 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/zone.c b/src/zone.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9432f45..9238161 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/zone.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/zone.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -168,6 +168,33 @@ zone_force_unlock(malloc_zone_t *zone)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jemalloc_postfork_parent();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static malloc_zone_t *get_default_zone()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ malloc_zone_t **zones = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unsigned int num_zones = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * On OSX 10.12, malloc_default_zone returns a special zone that is not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * present in the list of registered zones. That zone uses a "lite zone"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * if one is present (apparently enabled when malloc stack logging is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * enabled), or the first registered zone otherwise. In practice this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * means unless malloc stack logging is enabled, the first registered
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * zone is the default.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * So get the list of zones to get the first one, instead of relying on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * malloc_default_zone.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (KERN_SUCCESS != malloc_get_all_zones(0, NULL, (vm_address_t**) &zones,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ &num_zones)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Reset the value in case the failure happened after it was set. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ num_zones = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (num_zones)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return zones[0];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return malloc_default_zone();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JEMALLOC_ATTR(constructor)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- register_zone(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -177,7 +204,7 @@ register_zone(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * If something else replaced the system default zone allocator, don't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * register jemalloc's.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- malloc_zone_t *default_zone = malloc_default_zone();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ malloc_zone_t *default_zone = get_default_zone();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- malloc_zone_t *purgeable_zone = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!default_zone->zone_name ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcmp(default_zone->zone_name, "DefaultMallocZone") != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -272,6 +299,6 @@ register_zone(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- malloc_zone_register(purgeable_zone);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- default_zone = malloc_default_zone();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ default_zone = get_default_zone();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } while (default_zone != &zone);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>