summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authordmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-17 22:05:40 +0000
committerdmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-17 22:05:40 +0000
commit2c867e59c1b35ca4b35cde9108a5b1184ceb640d (patch)
tree6d6a56bc887541e044127a18110753d4122fcb23 /third_party
parent28ff22415ecbb68e0a5157a46e206bd74b27ce91 (diff)
downloadchromium_src-2c867e59c1b35ca4b35cde9108a5b1184ceb640d.zip
chromium_src-2c867e59c1b35ca4b35cde9108a5b1184ceb640d.tar.gz
chromium_src-2c867e59c1b35ca4b35cde9108a5b1184ceb640d.tar.bz2
Revert 127301 - Try fixing virtual memory regression from new tcmalloc: use old kPageShift and kMaxSize w/ kNumClasses = 54.
Will be reverted. BUG=118329 TEST=perf tests. Review URL: https://chromiumcodereview.appspot.com/9722001 TBR=dmikurube@chromium.org Review URL: https://chromiumcodereview.appspot.com/9722024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127379 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/tcmalloc/chromium/src/common.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/third_party/tcmalloc/chromium/src/common.h b/third_party/tcmalloc/chromium/src/common.h
index 2d24218..4f848fa 100644
--- a/third_party/tcmalloc/chromium/src/common.h
+++ b/third_party/tcmalloc/chromium/src/common.h
@@ -79,18 +79,14 @@ static const size_t kSkippedClasses = (kAlignment < kMinClassSize ? 1 : 0);
static const size_t kPageShift = 15;
static const size_t kNumClasses = 78 - kSkippedClasses;
#else
-// Original TCMalloc code used kPageShift == 13. In Chromium, we changed
-// this to 12 (as was done in prior versions of TCMalloc).
-static const size_t kPageShift = 12;
-static const size_t kNumClasses = 54 - kSkippedClasses;
+static const size_t kPageShift = 13;
+static const size_t kNumClasses = 86 - kSkippedClasses;
#endif
static const size_t kMaxThreadCacheSize = 4 << 20;
static const size_t kPageSize = 1 << kPageShift;
-// Original TCMalloc code used kMaxSize == 256 * 1024. In Chromium, we
-// changed this to 32K, and represent it in terms of page size (as was done
-// in prior versions of TCMalloc).
-static const size_t kMaxSize = 8u * kPageSize;
+// TODO(dmikurube): We Chromium may want to tune this kMaxSize.
+static const size_t kMaxSize = 256 * 1024;
// For all span-lengths < kMaxPages we keep an exact-size list.
static const size_t kMaxPages = 1 << (20 - kPageShift);