summaryrefslogtreecommitdiffstats
path: root/base/allocator
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-07 08:08:30 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-07 08:08:30 +0000
commite088e2922e961659768eb406714cac79e021e5fc (patch)
treefd86553b3e40aecabf87a524f0dfbfaa53d2952f /base/allocator
parente089f385c13b8ee10a0d6c2e3c4816572cd78e5a (diff)
downloadchromium_src-e088e2922e961659768eb406714cac79e021e5fc.zip
chromium_src-e088e2922e961659768eb406714cac79e021e5fc.tar.gz
chromium_src-e088e2922e961659768eb406714cac79e021e5fc.tar.bz2
Revert 77111 - Test performance of default allocator in browser process
This is a test, and will be reverted as soon as the build starts. We just want to see what the perf bots have to say. This CL changes the default allocator to be the Windows Allocator (rather than TCMalloc), but then overrides that default via the environment variable control *during* the running of the browser_main. The result is that the browser process will use the Windows Allocator, but all sub-processes, such as renderers, will use TCMalloc. TBR=cpu BUG=74901 Review URL: http://codereview.chromium.org/6624050 TBR=jar@chromium.org Review URL: http://codereview.chromium.org/6627045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/allocator')
-rw-r--r--base/allocator/allocator_shim.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/allocator/allocator_shim.cc b/base/allocator/allocator_shim.cc
index 685f700..3935737 100644
--- a/base/allocator/allocator_shim.cc
+++ b/base/allocator/allocator_shim.cc
@@ -35,7 +35,7 @@ typedef enum {
} Allocator;
// This is the default allocator.
-static Allocator allocator = WINDEFAULT;
+static Allocator allocator = TCMALLOC;
// We include tcmalloc and the win_allocator to get as much inlining as
// possible.