From 2ba5f8f4f349dacba76135a1eb31969f878ee39e Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Wed, 15 Nov 2017 18:10:32 +0100 Subject: [PATCH] timer framework: use Time_source::curr_time() Issue #2579 --- repos/os/src/lib/timeout/timeout.cc | 5 ++--- repos/os/src/lib/timeout/timer_connection.cc | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/repos/os/src/lib/timeout/timeout.cc b/repos/os/src/lib/timeout/timeout.cc index fef207ca7d..9fda814fc0 100644 --- a/repos/os/src/lib/timeout/timeout.cc +++ b/repos/os/src/lib/timeout/timeout.cc @@ -65,10 +65,9 @@ bool Timeout::Alarm::on_alarm(unsigned) ** Alarm_timeout_scheduler ** *****************************/ -void Alarm_timeout_scheduler::handle_timeout(Duration) +void Alarm_timeout_scheduler::handle_timeout(Duration duration) { - unsigned long const curr_time_us = - _time_source.curr_time().trunc_to_plain_us().value; + unsigned long const curr_time_us = duration.trunc_to_plain_us().value; _alarm_scheduler.handle(curr_time_us); diff --git a/repos/os/src/lib/timeout/timer_connection.cc b/repos/os/src/lib/timeout/timer_connection.cc index 3d2395fddb..cc86b62a50 100644 --- a/repos/os/src/lib/timeout/timer_connection.cc +++ b/repos/os/src/lib/timeout/timer_connection.cc @@ -92,7 +92,7 @@ void Timer::Connection::_handle_timeout() _update_real_time(); } if (_handler) { - _handler->handle_timeout(Duration(Microseconds(us))); + _handler->handle_timeout(curr_time()); } }