diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/spin_wait.h | 6 | ||||
| -rw-r--r-- | base/tracked.cc | 10 | ||||
| -rw-r--r-- | base/tracked.h | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/base/spin_wait.h b/base/spin_wait.h index d6571b7..b1e2045 100644 --- a/base/spin_wait.h +++ b/base/spin_wait.h @@ -35,11 +35,11 @@ (expression)) #define SPIN_FOR_TIMEDELTA_OR_UNTIL_TRUE(delta, expression) do { \ - base::Time start = base::Time::Now(); \ + base::TimeTicks start = base::TimeTicks::Now(); \ const base::TimeDelta kTimeout = delta; \ while (!(expression)) { \ - if (kTimeout < base::Time::Now() - start) { \ - EXPECT_LE((base::Time::Now() - start).InMilliseconds(), \ + if (kTimeout < base::TimeTicks::Now() - start) { \ + EXPECT_LE((base::TimeTicks::Now() - start).InMilliseconds(), \ kTimeout.InMilliseconds()) << "Timed out"; \ break; \ } \ diff --git a/base/tracked.cc b/base/tracked.cc index 34694bb..fdac6d3 100644 --- a/base/tracked.cc +++ b/base/tracked.cc @@ -7,7 +7,7 @@ #include "base/string_util.h" #include "base/tracked_objects.h" -using base::Time; +using base::TimeTicks; namespace tracked_objects { @@ -56,7 +56,9 @@ void Tracked::ResetBirthTime() {} #else -Tracked::Tracked() : tracked_births_(NULL), tracked_birth_time_(Time::Now()) { +Tracked::Tracked() + : tracked_births_(NULL), + tracked_birth_time_(TimeTicks::Now()) { if (!ThreadData::IsActive()) return; SetBirthPlace(Location("NoFunctionName", "NeedToSetBirthPlace", -1)); @@ -66,7 +68,7 @@ Tracked::~Tracked() { if (!ThreadData::IsActive() || !tracked_births_) return; ThreadData::current()->TallyADeath(*tracked_births_, - Time::Now() - tracked_birth_time_); + TimeTicks::Now() - tracked_birth_time_); } void Tracked::SetBirthPlace(const Location& from_here) { @@ -81,7 +83,7 @@ void Tracked::SetBirthPlace(const Location& from_here) { } void Tracked::ResetBirthTime() { - tracked_birth_time_ = Time::Now(); + tracked_birth_time_ = TimeTicks::Now(); } bool Tracked::MissingBirthplace() const { diff --git a/base/tracked.h b/base/tracked.h index c0c3aee..b0be729 100644 --- a/base/tracked.h +++ b/base/tracked.h @@ -116,7 +116,7 @@ class Tracked { // The time this object was constructed. If its life consisted of a long // waiting period, and then it became active, then this value is generally // reset before the object begins it active life. - base::Time tracked_birth_time_; + base::TimeTicks tracked_birth_time_; #endif // TRACK_ALL_TASK_OBJECTS |