mozilla-central: changeset 221376:9d2a1e5945331d83e863b7a059992a760f8465f7

author	Guilherme Goncalves <guilherme.p.gonc@gmail.com>
	Wed, 12 Nov 2014 13:00:00 -0500
changeset 221376	9d2a1e5945331d83e863b7a059992a760f8465f7
parent 221375	b67489a65e49751b2b8f5c0d0fae26ef4f225c83
child 221377	495ecf1836228489f3780ea28e289427cba75da6
push id	28019
push user	ryanvm@gmail.com
push date	Fri, 26 Dec 2014 19:40:56 +0000
treeherder	mozilla-central@893064841be2 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	glandium
bugs	762448
milestone	37.0a1
first release with	nightly linux32 6530bfc2636e / 37.0a1 / 20141227030218 / files nightly linux64 6530bfc2636e / 37.0a1 / 20141227030218 / files nightly mac 6530bfc2636e / 37.0a1 / 20141227030218 / files nightly win32 6530bfc2636e / 37.0a1 / 20141227030218 / files nightly win64 6530bfc2636e / 37.0a1 / 20141227030218 / files
last release without	nightly linux32 986ef444a8bb / 37.0a1 / 20141226030205 / files nightly linux64 986ef444a8bb / 37.0a1 / 20141226030205 / files nightly mac 986ef444a8bb / 37.0a1 / 20141226030205 / files nightly win32 986ef444a8bb / 37.0a1 / 20141226030205 / files nightly win64 986ef444a8bb / 37.0a1 / 20141226030205 / files

--- a/memory/build/mozjemalloc_compat.c
+++ b/memory/build/mozjemalloc_compat.c
@@ -161,16 +161,17 @@ jemalloc_stats_impl(jemalloc_stats_t *st
   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->bin_unused = compute_bin_unused(narenas);
+  stats->waste -= stats->bin_unused;
 }
 
 MOZ_JEMALLOC_API void
 jemalloc_purge_freed_pages_impl()
 {
 }
 
 MOZ_JEMALLOC_API void