svn commit: r394871 - in head: Mk mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files www/libxul www/libxul/files www/seamonkey www/seamonkey...
Jan Beich
jbeich at FreeBSD.org
Thu Aug 20 13:16:16 UTC 2015
Author: jbeich
Date: Thu Aug 20 13:16:12 2015
New Revision: 394871
URL: https://svnweb.freebsd.org/changeset/ports/394871
Log:
gecko: use system jemalloc on 11.0-CURRENT again
Requested by: mi
Added:
head/mail/thunderbird/files/extra-patch-bug1125514 (contents, props changed)
head/www/firefox-esr/files/extra-patch-bug1125514 (contents, props changed)
head/www/firefox/files/extra-patch-bug1125514 (contents, props changed)
head/www/libxul/files/extra-patch-bug1125514 (contents, props changed)
head/www/seamonkey/files/extra-patch-bug1125514 (contents, props changed)
Modified:
head/Mk/bsd.gecko.mk (contents, props changed)
head/mail/thunderbird/Makefile (contents, props changed)
head/www/firefox-esr/Makefile (contents, props changed)
head/www/firefox/Makefile (contents, props changed)
head/www/libxul/Makefile (contents, props changed)
head/www/seamonkey/Makefile (contents, props changed)
head/www/seamonkey/files/patch-bug899126 (contents, props changed)
Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk Thu Aug 20 13:15:18 2015 (r394870)
+++ head/Mk/bsd.gecko.mk Thu Aug 20 13:16:12 2015 (r394871)
@@ -130,7 +130,12 @@ LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath
# use jemalloc 3.0.0 API for stats/tuning
MOZ_EXPORT+= MOZ_JEMALLOC3=1
-.if ${OSVERSION} < 1000012 || ${MOZILLA_VER:R:R} >= 37
+.if ${OSVERSION} >= 1100079
+. if ${MOZILLA_VER:R:R} < 43
+# system jemalloc 4.0.0 vs. bundled jemalloc 3.6.0-204-gb4acf73
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bug1125514
+. endif
+.elif ${OSVERSION} < 1000012 || ${MOZILLA_VER:R:R} >= 37
MOZ_OPTIONS+= --enable-jemalloc
.endif
Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile Thu Aug 20 13:15:18 2015 (r394870)
+++ head/mail/thunderbird/Makefile Thu Aug 20 13:16:12 2015 (r394871)
@@ -3,6 +3,7 @@
PORTNAME= thunderbird
DISTVERSION= 38.2.0
+PORTREVISION= 1
CATEGORIES= mail news net-im ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
Added: head/mail/thunderbird/files/extra-patch-bug1125514
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/thunderbird/files/extra-patch-bug1125514 Thu Aug 20 13:16:12 2015 (r394871)
@@ -0,0 +1,36 @@
+changeset: 258513:ffbd5f5f46f1
+user: Guilherme Goncalves <guilherme.p.gonc at gmail.com>
+date: Thu Aug 20 10:05:29 2015 +0900
+summary: Bug 1125514 - Use jemalloc's metadata statistics to compute bookkeeping. r=glandium
+
+--- mozilla/memory/build/mozjemalloc_compat.c~
++++ mozilla/memory/build/mozjemalloc_compat.c
+@@ -136,6 +136,7 @@ jemalloc_stats_impl(jemalloc_stats_t *st
+ {
+ unsigned narenas;
+ size_t active, allocated, mapped, page, pdirty;
++ size_t meta, ameta;
+ size_t lg_chunk;
+
+ // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in
+@@ -149,17 +150,19 @@ jemalloc_stats_impl(jemalloc_stats_t *st
+ CTL_GET("stats.active", active);
+ CTL_GET("stats.allocated", allocated);
+ CTL_GET("stats.mapped", mapped);
++ CTL_GET("stats.metadata", meta);
+ CTL_GET("opt.lg_chunk", lg_chunk);
+- CTL_GET("stats.bookkeeping", stats->bookkeeping);
+
+ /* get the summation for all arenas, i == narenas */
+ CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas);
++ CTL_I_GET("stats.arenas.0.metadata.allocated", ameta, narenas);
+
+ stats->chunksize = 1 << lg_chunk;
+ stats->mapped = mapped;
+ stats->allocated = allocated;
+ stats->waste = active - allocated;
+ stats->page_cache = pdirty * page;
++ stats->bookkeeping = meta - ameta;
+ stats->bin_unused = compute_bin_unused(narenas);
+ stats->waste -= stats->bin_unused;
+ }
Modified: head/www/firefox-esr/Makefile
==============================================================================
--- head/www/firefox-esr/Makefile Thu Aug 20 13:15:18 2015 (r394870)
+++ head/www/firefox-esr/Makefile Thu Aug 20 13:16:12 2015 (r394871)
@@ -4,7 +4,7 @@
PORTNAME= firefox
DISTVERSION= 38.2.0
DISTVERSIONSUFFIX=esr.source
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
Added: head/www/firefox-esr/files/extra-patch-bug1125514
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/firefox-esr/files/extra-patch-bug1125514 Thu Aug 20 13:16:12 2015 (r394871)
@@ -0,0 +1,36 @@
+changeset: 258513:ffbd5f5f46f1
+user: Guilherme Goncalves <guilherme.p.gonc at gmail.com>
+date: Thu Aug 20 10:05:29 2015 +0900
+summary: Bug 1125514 - Use jemalloc's metadata statistics to compute bookkeeping. r=glandium
+
+--- memory/build/mozjemalloc_compat.c~
++++ memory/build/mozjemalloc_compat.c
+@@ -136,6 +136,7 @@ jemalloc_stats_impl(jemalloc_stats_t *st
+ {
+ unsigned narenas;
+ size_t active, allocated, mapped, page, pdirty;
++ size_t meta, ameta;
+ size_t lg_chunk;
+
+ // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in
+@@ -149,17 +150,19 @@ jemalloc_stats_impl(jemalloc_stats_t *st
+ CTL_GET("stats.active", active);
+ CTL_GET("stats.allocated", allocated);
+ CTL_GET("stats.mapped", mapped);
++ CTL_GET("stats.metadata", meta);
+ CTL_GET("opt.lg_chunk", lg_chunk);
+- CTL_GET("stats.bookkeeping", stats->bookkeeping);
+
+ /* get the summation for all arenas, i == narenas */
+ CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas);
++ CTL_I_GET("stats.arenas.0.metadata.allocated", ameta, narenas);
+
+ stats->chunksize = 1 << lg_chunk;
+ stats->mapped = mapped;
+ stats->allocated = allocated;
+ stats->waste = active - allocated;
+ stats->page_cache = pdirty * page;
++ stats->bookkeeping = meta - ameta;
+ stats->bin_unused = compute_bin_unused(narenas);
+ stats->waste -= stats->bin_unused;
+ }
Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile Thu Aug 20 13:15:18 2015 (r394870)
+++ head/www/firefox/Makefile Thu Aug 20 13:16:12 2015 (r394871)
@@ -4,7 +4,7 @@
PORTNAME= firefox
DISTVERSION= 40.0
DISTVERSIONSUFFIX=.source
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
Added: head/www/firefox/files/extra-patch-bug1125514
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/firefox/files/extra-patch-bug1125514 Thu Aug 20 13:16:12 2015 (r394871)
@@ -0,0 +1,36 @@
+changeset: 258513:ffbd5f5f46f1
+user: Guilherme Goncalves <guilherme.p.gonc at gmail.com>
+date: Thu Aug 20 10:05:29 2015 +0900
+summary: Bug 1125514 - Use jemalloc's metadata statistics to compute bookkeeping. r=glandium
+
+--- memory/build/mozjemalloc_compat.c~
++++ memory/build/mozjemalloc_compat.c
+@@ -136,6 +136,7 @@ jemalloc_stats_impl(jemalloc_stats_t *st
+ {
+ unsigned narenas;
+ size_t active, allocated, mapped, page, pdirty;
++ size_t meta, ameta;
+ size_t lg_chunk;
+
+ // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in
+@@ -149,17 +150,19 @@ jemalloc_stats_impl(jemalloc_stats_t *st
+ CTL_GET("stats.active", active);
+ CTL_GET("stats.allocated", allocated);
+ CTL_GET("stats.mapped", mapped);
++ CTL_GET("stats.metadata", meta);
+ CTL_GET("opt.lg_chunk", lg_chunk);
+- CTL_GET("stats.bookkeeping", stats->bookkeeping);
+
+ /* get the summation for all arenas, i == narenas */
+ CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas);
++ CTL_I_GET("stats.arenas.0.metadata.allocated", ameta, narenas);
+
+ stats->chunksize = (size_t) 1 << lg_chunk;
+ stats->mapped = mapped;
+ stats->allocated = allocated;
+ stats->waste = active - allocated;
+ stats->page_cache = pdirty * page;
++ stats->bookkeeping = meta - ameta;
+ stats->bin_unused = compute_bin_unused(narenas);
+ stats->waste -= stats->bin_unused;
+ }
Modified: head/www/libxul/Makefile
==============================================================================
--- head/www/libxul/Makefile Thu Aug 20 13:15:18 2015 (r394870)
+++ head/www/libxul/Makefile Thu Aug 20 13:16:12 2015 (r394871)
@@ -3,7 +3,7 @@
PORTNAME= libxul
DISTVERSION= 38.2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= www devel
MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \
MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build2/source
Added: head/www/libxul/files/extra-patch-bug1125514
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/libxul/files/extra-patch-bug1125514 Thu Aug 20 13:16:12 2015 (r394871)
@@ -0,0 +1,36 @@
+changeset: 258513:ffbd5f5f46f1
+user: Guilherme Goncalves <guilherme.p.gonc at gmail.com>
+date: Thu Aug 20 10:05:29 2015 +0900
+summary: Bug 1125514 - Use jemalloc's metadata statistics to compute bookkeeping. r=glandium
+
+--- memory/build/mozjemalloc_compat.c~
++++ memory/build/mozjemalloc_compat.c
+@@ -136,6 +136,7 @@ jemalloc_stats_impl(jemalloc_stats_t *st
+ {
+ unsigned narenas;
+ size_t active, allocated, mapped, page, pdirty;
++ size_t meta, ameta;
+ size_t lg_chunk;
+
+ // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in
+@@ -149,17 +150,19 @@ jemalloc_stats_impl(jemalloc_stats_t *st
+ CTL_GET("stats.active", active);
+ CTL_GET("stats.allocated", allocated);
+ CTL_GET("stats.mapped", mapped);
++ CTL_GET("stats.metadata", meta);
+ CTL_GET("opt.lg_chunk", lg_chunk);
+- CTL_GET("stats.bookkeeping", stats->bookkeeping);
+
+ /* get the summation for all arenas, i == narenas */
+ CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas);
++ CTL_I_GET("stats.arenas.0.metadata.allocated", ameta, narenas);
+
+ stats->chunksize = 1 << lg_chunk;
+ stats->mapped = mapped;
+ stats->allocated = allocated;
+ stats->waste = active - allocated;
+ stats->page_cache = pdirty * page;
++ stats->bookkeeping = meta - ameta;
+ stats->bin_unused = compute_bin_unused(narenas);
+ stats->waste -= stats->bin_unused;
+ }
Modified: head/www/seamonkey/Makefile
==============================================================================
--- head/www/seamonkey/Makefile Thu Aug 20 13:15:18 2015 (r394870)
+++ head/www/seamonkey/Makefile Thu Aug 20 13:16:12 2015 (r394871)
@@ -3,7 +3,7 @@
PORTNAME= seamonkey
DISTVERSION= 2.33.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES?= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
Added: head/www/seamonkey/files/extra-patch-bug1125514
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/seamonkey/files/extra-patch-bug1125514 Thu Aug 20 13:16:12 2015 (r394871)
@@ -0,0 +1,39 @@
+changeset: 258513:ffbd5f5f46f1
+user: Guilherme Goncalves <guilherme.p.gonc at gmail.com>
+date: Thu Aug 20 10:05:29 2015 +0900
+summary: Bug 1125514 - Use jemalloc's metadata statistics to compute bookkeeping. r=glandium
+
+--- mozilla/memory/build/mozjemalloc_compat.c~
++++ mozilla/memory/build/mozjemalloc_compat.c
+@@ -66,6 +66,7 @@ jemalloc_stats_impl(jemalloc_stats_t *st
+ {
+ unsigned narenas;
+ size_t active, allocated, mapped, page, pdirty;
++ size_t meta, ameta;
+ size_t lg_chunk;
+
+ // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in
+@@ -79,20 +80,19 @@ jemalloc_stats_impl(jemalloc_stats_t *st
+ CTL_GET("stats.active", active);
+ CTL_GET("stats.allocated", allocated);
+ CTL_GET("stats.mapped", mapped);
++ CTL_GET("stats.metadata", meta);
+ CTL_GET("opt.lg_chunk", lg_chunk);
+
+ /* get the summation for all arenas, i == narenas */
+ CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas);
++ CTL_I_GET("stats.arenas.0.metadata.allocated", ameta, narenas);
+
+ stats->chunksize = 1 << lg_chunk;
+ stats->mapped = mapped;
+ stats->allocated = allocated;
+ stats->waste = active - allocated;
+ stats->page_cache = pdirty * page;
+-
+- // We could get this value out of base.c::base_pages, but that really should
+- // be an upstream change, so don't worry about it for now.
+- stats->bookkeeping = 0;
++ stats->bookkeeping = meta - ameta;
+ stats->bin_unused = 0;
+ }
+
Modified: head/www/seamonkey/files/patch-bug899126
==============================================================================
--- head/www/seamonkey/files/patch-bug899126 Thu Aug 20 13:15:18 2015 (r394870)
+++ head/www/seamonkey/files/patch-bug899126 Thu Aug 20 13:16:12 2015 (r394871)
@@ -86,10 +86,7 @@ index 70265a7..0a9b21a 100644
MOZ_JEMALLOC_API void
jemalloc_stats_impl(jemalloc_stats_t *stats)
{
-@@ -93,7 +147,8 @@ jemalloc_stats_impl(jemalloc_stats_t *stats)
- // We could get this value out of base.c::base_pages, but that really should
- // be an upstream change, so don't worry about it for now.
- stats->bookkeeping = 0;
+@@ -96,4 +150,5 @@ jemalloc_stats_impl(jemalloc_stats_t *stats)
- stats->bin_unused = 0;
+
+ stats->bin_unused = compute_bin_unused(narenas);
More information about the svn-ports-all
mailing list