Index: base/tracked_objects.cc |
=================================================================== |
--- base/tracked_objects.cc (revision 133778) |
+++ base/tracked_objects.cc (working copy) |
@@ -648,9 +648,21 @@ |
} |
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() { |
Property changes on: base/tracked_objects.cc |
___________________________________________________________________ |
Deleted: svn:mergeinfo |