aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2015-12-23 06:44:36 +0000
committerJan Beich <jbeich@FreeBSD.org>2015-12-23 06:44:36 +0000
commit8fbe51e5a4801ed99caddcc0501c70d0a965763c (patch)
tree35f53b373a8a68cdfb3aa73657b715be2aba24fd
parent11638260c4a1c6077de0cb6ac25fd559fa8514e5 (diff)
downloadports-8fbe51e5a4801ed99caddcc0501c70d0a965763c.tar.gz
ports-8fbe51e5a4801ed99caddcc0501c70d0a965763c.zip
MFH: r404277
www/firefox: prune unused/upstreamed patch PR: 205357 Approved by: ports-secteam blanket
Notes
Notes: svn path=/branches/2015Q4/; revision=404278
-rw-r--r--www/firefox/files/extra-patch-bug112551436
1 files changed, 0 insertions, 36 deletions
diff --git a/www/firefox/files/extra-patch-bug1125514 b/www/firefox/files/extra-patch-bug1125514
deleted file mode 100644
index 07d8b014d0a0..000000000000
--- a/www/firefox/files/extra-patch-bug1125514
+++ /dev/null
@@ -1,36 +0,0 @@
-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
-
---- 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;
- }