diff options
| -rw-r--r-- | Kernel/Syscalls/clock.cpp | 15 | ||||
| -rw-r--r-- | Kernel/Time/TimeManagement.cpp | 6 | ||||
| -rw-r--r-- | Kernel/Time/TimeManagement.h | 1 |
3 files changed, 12 insertions, 10 deletions
diff --git a/Kernel/Syscalls/clock.cpp b/Kernel/Syscalls/clock.cpp index 0f0f5d4d7e..8dc4571e71 100644 --- a/Kernel/Syscalls/clock.cpp +++ b/Kernel/Syscalls/clock.cpp @@ -98,16 +98,11 @@ ErrorOr<FlatPtr> Process::sys$clock_getres(Userspace<Syscall::SC_clock_getres_pa { VERIFY_NO_PROCESS_BIG_LOCK(this); auto params = TRY(copy_typed_from_user(user_params)); - timespec ts {}; - switch (params.clock_id) { - case CLOCK_REALTIME: - ts.tv_sec = 0; - ts.tv_nsec = 1000000000 / _SC_CLK_TCK; - TRY(copy_to_user(params.result, &ts)); - break; - default: - return EINVAL; - } + + TRY(TimeManagement::validate_clock_id(params.clock_id)); + + auto ts = TimeManagement::the().clock_resolution().to_timespec(); + TRY(copy_to_user(params.result, &ts)); return 0; } diff --git a/Kernel/Time/TimeManagement.cpp b/Kernel/Time/TimeManagement.cpp index e58b063b46..e11eb47226 100644 --- a/Kernel/Time/TimeManagement.cpp +++ b/Kernel/Time/TimeManagement.cpp @@ -237,6 +237,12 @@ Time TimeManagement::boot_time() #endif } +Time TimeManagement::clock_resolution() const +{ + long nanoseconds_per_tick = 1'000'000'000 / m_time_keeper_timer->ticks_per_second(); + return Time::from_nanoseconds(nanoseconds_per_tick); +} + UNMAP_AFTER_INIT TimeManagement::TimeManagement() : m_time_page_region(MM.allocate_kernel_region(PAGE_SIZE, "Time page"sv, Memory::Region::Access::ReadWrite, AllocationStrategy::AllocateNow).release_value_but_fixme_should_propagate_errors()) { diff --git a/Kernel/Time/TimeManagement.h b/Kernel/Time/TimeManagement.h index c0371c6d35..4346f16925 100644 --- a/Kernel/Time/TimeManagement.h +++ b/Kernel/Time/TimeManagement.h @@ -52,6 +52,7 @@ public: void set_epoch_time(Time); time_t ticks_per_second() const; static Time boot_time(); + Time clock_resolution() const; bool is_system_timer(HardwareTimerBase const&) const; |