Sinipelto
/
banan-os
forked from Bananymous/banan-os
1
0
Fork 0
Code Pull Requests Activity

Kernel: Move sleep() implementation to TimerHandler

This commit is contained in:
Bananymous 2023-08-04 15:15:00 +03:00
parent 2c59c9a3cc
commit d4adcff958
4 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/include/kernel/Timer/PIT.h
View File

@ -14,7 +14,6 @@ namespace Kernel
static BAN::ErrorOr<BAN::UniqPtr<PIT>> create(); static BAN::ErrorOr<BAN::UniqPtr<PIT>> create();
virtual uint64_t ms_since_boot() const override; virtual uint64_t ms_since_boot() const override;
virtual void sleep(uint64_t) const override;
private: private:
void initialize(); void initialize();

3
kernel/include/kernel/Timer/Timer.h
View File

@ -12,7 +12,6 @@ namespace Kernel
public: public:
virtual ~Timer() {}; virtual ~Timer() {};
virtual uint64_t ms_since_boot() const = 0; virtual uint64_t ms_since_boot() const = 0;
virtual void sleep(uint64_t) const = 0;
}; };
class TimerHandler class TimerHandler
@ -35,7 +34,7 @@ namespace Kernel
private: private:
uint64_t m_boot_time { 0 }; uint64_t m_boot_time { 0 };
BAN::UniqPtr<RTC> m_rtc; BAN::UniqPtr<RTC> m_rtc;
BAN::Vector<BAN::UniqPtr<Timer>> m_timers; BAN::UniqPtr<Timer> m_timer;
}; };
} }

10
kernel/kernel/Timer/PIT.cpp
View File

@ -60,14 +60,4 @@ namespace Kernel
return s_system_time; return s_system_time;
} }
void PIT::sleep(uint64_t ms) const
{
if (ms == 0)
return;
uint64_t wake_time = s_system_time + ms;
Kernel::Scheduler::get().set_current_thread_sleeping(wake_time);
if (s_system_time < wake_time)
dwarnln("sleep woke {} ms too soon", wake_time - s_system_time);
}
} }

17
kernel/kernel/Timer/Timer.cpp
View File

@ -1,5 +1,6 @@
#include <kernel/Timer/Timer.h> #include <kernel/Scheduler.h>
#include <kernel/Timer/PIT.h> #include <kernel/Timer/PIT.h>
#include <kernel/Timer/Timer.h>
namespace Kernel namespace Kernel
{ {
@ -35,21 +36,27 @@ namespace Kernel
dwarnln("PIT: {}", res.error()); dwarnln("PIT: {}", res.error());
else else
{ {
MUST(m_timers.emplace_back(BAN::move(res.release_value()))); m_timer = res.release_value();
dprintln("PIT initialized"); dprintln("PIT initialized");
return;
} }
ASSERT(!m_timers.empty()); Kernel::panic("Could not initialize any timer");
} }
uint64_t TimerHandler::ms_since_boot() const uint64_t TimerHandler::ms_since_boot() const
{ {
return m_timers.front()->ms_since_boot(); return m_timer->ms_since_boot();
} }
void TimerHandler::sleep(uint64_t ms) const void TimerHandler::sleep(uint64_t ms) const
{ {
return m_timers.front()->sleep(ms); if (ms == 0)
return;
uint64_t wake_time = ms_since_boot() + ms;
Scheduler::get().set_current_thread_sleeping(wake_time);
if (ms_since_boot() < wake_time)
dwarnln("sleep woke {} ms too soon", wake_time - ms_since_boot());
} }
uint64_t TimerHandler::get_unix_timestamp() uint64_t TimerHandler::get_unix_timestamp()