diff options
| author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 00:36:49 +0000 |
|---|---|---|
| committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 00:36:49 +0000 |
| commit | 8f82968945b4e4567f961dab42c9f291b66112a5 (patch) | |
| tree | a6fb901d13d0062bb91e77049001451c66ab93b3 /base/allocator | |
| parent | c239336e9507a35a758fe58f54e7b3efcf02d48c (diff) | |
| download | chromium_src-8f82968945b4e4567f961dab42c9f291b66112a5.zip chromium_src-8f82968945b4e4567f961dab42c9f291b66112a5.tar.gz chromium_src-8f82968945b4e4567f961dab42c9f291b66112a5.tar.bz2 | |
Explicitly track the time source type in base/profiler/alternate_timer.h
We were previously implicitly tracking the time source as either default or tcmalloc-based; but as we add more time sources (e.g. cpu time), we'll want to have explicit tracking for this.
BUG=none
TEST=none
TBR=jar@chromium.org
(Recommit of [ https://chromiumcodereview.appspot.com/10225017/ ])
Review URL: http://codereview.chromium.org/10248001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/allocator')
| -rw-r--r-- | base/allocator/allocator_shim.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/base/allocator/allocator_shim.cc b/base/allocator/allocator_shim.cc index d61a9a4..075828d 100644 --- a/base/allocator/allocator_shim.cc +++ b/base/allocator/allocator_shim.cc @@ -270,7 +270,8 @@ extern "C" int _heap_init() { GetenvBeforeMain(tracked_objects::kAlternateProfilerTime); if (profiling && *profiling == '1') { tracked_objects::SetAlternateTimeSource( - tcmalloc::ThreadCache::GetBytesAllocatedOnCurrentThread); + tcmalloc::ThreadCache::GetBytesAllocatedOnCurrentThread, + tracked_objects::TIME_SOURCE_TYPE_TCMALLOC); } return 1; |