0ct0pu5/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-11 17:00:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibCore: Use monotonic time when handling timers

Browse source
This commit is contained in:
Liav A 2020-03-14 01:03:47 +02:00 committed by Andreas Kling
parent b536547c52
commit 7268499c76
Notes: sideshowbarker 2024-07-19 08:14:03 +09:00 
Author: https://github.com/supercomputer7
Commit: https://github.com/SerenityOS/serenity/commit/7268499c768
Pull-request: https://github.com/SerenityOS/serenity/pull/1396
Reviewed-by: https://github.com/awesomekling
Reviewed-by: https://github.com/shannonbooth ✅
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Libraries/LibCore/ElapsedTimer.cpp
View file

@ -28,20 +28,27 @@
#include <AK/Time.h>
#include <LibCore/ElapsedTimer.h>
#include <sys/time.h>
#include <time.h>
namespace Core {
void ElapsedTimer::start()
{
m_valid = true;
gettimeofday(&m_start_time, nullptr);
timespec now_spec;
clock_gettime(CLOCK_MONOTONIC, &now_spec);
m_start_time.tv_sec = now_spec.tv_sec;
m_start_time.tv_usec = now_spec.tv_nsec / 1000;
}
int ElapsedTimer::elapsed() const
{
ASSERT(is_valid());
struct timeval now;
gettimeofday(&now, nullptr);
timespec now_spec;
clock_gettime(CLOCK_MONOTONIC, &now_spec);
now.tv_sec = now_spec.tv_sec;
now.tv_usec = now_spec.tv_nsec / 1000;
struct timeval diff;
timeval_sub(now, m_start_time, diff);
return diff.tv_sec * 1000 + diff.tv_usec / 1000;

15
Libraries/LibCore/EventLoop.cpp
View file

@ -420,7 +420,10 @@ void EventLoop::wait_for_event(WaitMode mode)
bool should_wait_forever = false;
if (mode == WaitMode::WaitForEvents) {
if (!s_timers->is_empty() && queued_events_is_empty) {
gettimeofday(&now, nullptr);
timespec now_spec;
clock_gettime(CLOCK_MONOTONIC, &now_spec);
now.tv_sec = now_spec.tv_sec;
now.tv_usec = now_spec.tv_nsec / 1000;
get_next_timer_expiration(timeout);
timeval_sub(timeout, now, timeout);
if (timeout.tv_sec < 0) {
@ -446,7 +449,10 @@ void EventLoop::wait_for_event(WaitMode mode)
}
if (!s_timers->is_empty()) {
gettimeofday(&now, nullptr);
timespec now_spec;
clock_gettime(CLOCK_MONOTONIC, &now_spec);
now.tv_sec = now_spec.tv_sec;
now.tv_usec = now_spec.tv_nsec / 1000;
}
for (auto& it : *s_timers) {
@ -521,7 +527,10 @@ int EventLoop::register_timer(Object& object, int milliseconds, bool should_relo
timer->owner = object.make_weak_ptr();
timer->interval = milliseconds;
timeval now;
gettimeofday(&now, nullptr);
timespec now_spec;
clock_gettime(CLOCK_MONOTONIC, &now_spec);
now.tv_sec = now_spec.tv_sec;
now.tv_usec = now_spec.tv_nsec / 1000;
timer->reload(now);
timer->should_reload = should_reload;
timer->fire_when_not_visible = fire_when_not_visible;