Kernel: Make TimerQueue use AK::Time in interface

luteresa · Mar 2, 2021 · 91c72fa · 91c72fa
1 parent 2b6546c
commit 91c72fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Kernel/TimerQueue.cpp b/Kernel/TimerQueue.cpp
@@ -137,12 +137,12 @@ void TimerQueue::add_timer_locked(NonnullRefPtr<Timer> timer)
  }
 }
 
-TimerId TimerQueue::add_timer(clockid_t clock_id, timeval& deadline, Function<void()>&& callback)
+TimerId TimerQueue::add_timer(clockid_t clock_id, const Time& deadline, Function<void()>&& callback)
 {
  // FIXME: Should use AK::Time internally
- auto expires = TimeManagement::the().current_time(clock_id).value();
- timespec_add_timeval(expires, deadline, expires);
- return add_timer(adopt(*new Timer(clock_id, Time::from_timespec(expires), move(callback))));
+ auto expires = Time::from_timespec(TimeManagement::the().current_time(clock_id).value());
+ expires = expires + deadline;
+ return add_timer(adopt(*new Timer(clock_id, expires, move(callback))));
 }
 
 bool TimerQueue::cancel_timer(TimerId id)

diff --git a/Kernel/TimerQueue.h b/Kernel/TimerQueue.h
@@ -93,7 +93,7 @@ class TimerQueue {
 
  TimerId add_timer(NonnullRefPtr<Timer>&&);
  RefPtr<Timer> add_timer_without_id(clockid_t, const Time&, Function<void()>&&);
- TimerId add_timer(clockid_t, timeval& timeout, Function<void()>&& callback);
+ TimerId add_timer(clockid_t, const Time& timeout, Function<void()>&& callback);
  bool cancel_timer(TimerId id);
  bool cancel_timer(Timer&);
  bool cancel_timer(NonnullRefPtr<Timer>&& timer)