diff options
Diffstat (limited to 'util/alarm.cc')
| -rw-r--r-- | util/alarm.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/util/alarm.cc b/util/alarm.cc index c72815a1..16f099e2 100644 --- a/util/alarm.cc +++ b/util/alarm.cc @@ -58,8 +58,7 @@ class Alarm::CancelableFunctor { Alarm* alarm_; }; -Alarm::Alarm(platform::ClockNowFunctionPtr now_function, - platform::TaskRunner* task_runner) +Alarm::Alarm(ClockNowFunctionPtr now_function, TaskRunner* task_runner) : now_function_(now_function), task_runner_(task_runner) { OSP_DCHECK(now_function_); OSP_DCHECK(task_runner_); @@ -73,11 +72,11 @@ Alarm::~Alarm() { } void Alarm::Cancel() { - scheduled_task_ = platform::TaskRunner::Task(); + scheduled_task_ = TaskRunner::Task(); } -void Alarm::ScheduleWithTask(platform::TaskRunner::Task task, - platform::Clock::time_point alarm_time) { +void Alarm::ScheduleWithTask(TaskRunner::Task task, + Clock::time_point alarm_time) { OSP_DCHECK(task.valid()); scheduled_task_ = std::move(task); @@ -94,8 +93,7 @@ void Alarm::ScheduleWithTask(platform::TaskRunner::Task task, InvokeLater(now_function_(), alarm_time); } -void Alarm::InvokeLater(platform::Clock::time_point now, - platform::Clock::time_point fire_time) { +void Alarm::InvokeLater(Clock::time_point now, Clock::time_point fire_time) { OSP_DCHECK(!queued_fire_); next_fire_time_ = fire_time; // Note: Instantiating the CancelableFunctor below sets |this->queued_fire_|. @@ -109,7 +107,7 @@ void Alarm::TryInvoke() { // If this is an early firing, re-schedule for later. This happens if // Schedule() was called again before this firing had occurred. - const platform::Clock::time_point now = now_function_(); + const Clock::time_point now = now_function_(); if (now < alarm_time_) { InvokeLater(now, alarm_time_); return; @@ -119,7 +117,7 @@ void Alarm::TryInvoke() { // itself: a) calls any Alarm methods re-entrantly, or b) causes the // destruction of this Alarm instance. // WARNING: |this| is not valid after here! - platform::TaskRunner::Task task = std::move(scheduled_task_); + TaskRunner::Task task = std::move(scheduled_task_); task(); } |