diff options
| author | jbeich <jbeich@FreeBSD.org> | 2015-08-20 21:16:12 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2015-08-20 21:16:12 +0800 |
| commit | 1b62a237991347164fbf3a7e56eb772955edfc77 (patch) | |
| tree | 16b15ab067f8e87a4b4e048d23f8761c97d74208 /mail | |
| parent | 318f1831f289565873c0a29cc58be54334dd2056 (diff) | |
| download | freebsd-ports-gnome-1b62a237991347164fbf3a7e56eb772955edfc77.tar.gz freebsd-ports-gnome-1b62a237991347164fbf3a7e56eb772955edfc77.tar.zst freebsd-ports-gnome-1b62a237991347164fbf3a7e56eb772955edfc77.zip | |
gecko: use system jemalloc on 11.0-CURRENT again
Requested by: mi
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/thunderbird/Makefile | 1 | ||||
| -rw-r--r-- | mail/thunderbird/files/extra-patch-bug1125514 | 36 |
2 files changed, 37 insertions, 0 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 5513773f9640..f29179ec503b 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -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 diff --git a/mail/thunderbird/files/extra-patch-bug1125514 b/mail/thunderbird/files/extra-patch-bug1125514 new file mode 100644 index 000000000000..a9c048334cf4 --- /dev/null +++ b/mail/thunderbird/files/extra-patch-bug1125514 @@ -0,0 +1,36 @@ +changeset: 258513:ffbd5f5f46f1 +user: Guilherme Goncalves <guilherme.p.gonc@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; + } |