diff options
author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-24 22:06:49 +0000 |
---|---|---|
committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-24 22:06:49 +0000 |
commit | 1a838cc4824267a5282c6f4eb748e4cb5d8749f4 (patch) | |
tree | 7f7d901b9de92f18cac382cb999a194c0f9322ea /base/tracked_objects.cc | |
parent | 768ff9204ffa2ffc490eeec19236de1921da94aa (diff) | |
download | chromium_src-1a838cc4824267a5282c6f4eb748e4cb5d8749f4.zip chromium_src-1a838cc4824267a5282c6f4eb748e4cb5d8749f4.tar.gz chromium_src-1a838cc4824267a5282c6f4eb748e4cb5d8749f4.tar.bz2 |
Revert 133773 - [UMA] Add performance profile data to UMA uploads.
BUG=103480
TEST=unit_test --gtest_filter=MetricsLogTest.*
Review URL: http://codereview.chromium.org/9702015
TBR=isherman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10169039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/tracked_objects.cc')
-rw-r--r-- | base/tracked_objects.cc | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/base/tracked_objects.cc b/base/tracked_objects.cc index ae508c4..fe3f712 100644 --- a/base/tracked_objects.cc +++ b/base/tracked_objects.cc @@ -648,9 +648,21 @@ void ThreadData::Reset() { } static void OptionallyInitializeAlternateTimer() { - NowFunction* alternate_time_source = GetAlternateTimeSource(); - if (alternate_time_source) - ThreadData::SetAlternateTimeSource(alternate_time_source); + char* alternate_selector = getenv(kAlternateProfilerTime); + if (!alternate_selector) + return; + switch (*alternate_selector) { + case '0': // This is the default value, and uses the wall clock time. + break; + case '1': { + // Use the TCMalloc allocations-on-thread as a pseudo-time. + ThreadData::SetAlternateTimeSource(GetAlternateTimeSource()); + break; + } + default: + NOTREACHED(); + break; + } } bool ThreadData::Initialize() { |