Browse Source
Use the newly added sys_clock API in lib/os for * clock_gettime() * clock_settime() * clock_nanosleep() and nanosleep() * gettimeofday() Signed-off-by: Chris Friedt <cfriedt@tenstorrent.com>pull/91872/head
Chris Friedt
2 months ago
committed by
Benjamin Cabé
7 changed files with 63 additions and 236 deletions
@ -1,204 +0,0 @@
@@ -1,204 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2018 Intel Corporation |
||||
* Copyright (c) 2018 Friedt Professional Engineering Services, Inc |
||||
* Copyright (c) 2025 Tenstorrent AI ULC |
||||
* |
||||
* SPDX-License-Identifier: Apache-2.0 |
||||
*/ |
||||
|
||||
#include "posix_clock.h" |
||||
|
||||
#include <zephyr/kernel.h> |
||||
#include <errno.h> |
||||
#include <zephyr/posix/time.h> |
||||
#include <zephyr/posix/sys/time.h> |
||||
#include <zephyr/posix/unistd.h> |
||||
#include <zephyr/internal/syscall_handler.h> |
||||
#include <zephyr/sys/sem.h> |
||||
#include <zephyr/sys/timeutil.h> |
||||
|
||||
/*
|
||||
* `k_uptime_get` returns a timestamp based on an always increasing |
||||
* value from the system start. To support the `CLOCK_REALTIME` |
||||
* clock, this `rt_clock_base` records the time that the system was |
||||
* started. This can either be set via 'clock_settime', or could be |
||||
* set from a real time clock, if such hardware is present. |
||||
*/ |
||||
static struct timespec rt_clock_base; |
||||
static SYS_SEM_DEFINE(rt_clock_base_lock, 1, 1); |
||||
|
||||
int z_impl___posix_clock_get_base(clockid_t clock_id, struct timespec *base) |
||||
{ |
||||
switch (clock_id) { |
||||
case CLOCK_MONOTONIC: |
||||
base->tv_sec = 0; |
||||
base->tv_nsec = 0; |
||||
break; |
||||
|
||||
case CLOCK_REALTIME: |
||||
SYS_SEM_LOCK(&rt_clock_base_lock) { |
||||
*base = rt_clock_base; |
||||
} |
||||
break; |
||||
|
||||
default: |
||||
errno = EINVAL; |
||||
return -1; |
||||
} |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
#ifdef CONFIG_USERSPACE |
||||
int z_vrfy___posix_clock_get_base(clockid_t clock_id, struct timespec *ts) |
||||
{ |
||||
K_OOPS(K_SYSCALL_MEMORY_WRITE(ts, sizeof(*ts))); |
||||
return z_impl___posix_clock_get_base(clock_id, ts); |
||||
} |
||||
#include <zephyr/syscalls/__posix_clock_get_base_mrsh.c> |
||||
#endif |
||||
|
||||
int z_clock_gettime(clockid_t clock_id, struct timespec *ts) |
||||
{ |
||||
struct timespec base = {.tv_sec = 0, .tv_nsec = 0}; |
||||
|
||||
switch (clock_id) { |
||||
case CLOCK_MONOTONIC: |
||||
break; |
||||
|
||||
case CLOCK_REALTIME: |
||||
(void)__posix_clock_get_base(clock_id, &base); |
||||
break; |
||||
|
||||
default: |
||||
errno = EINVAL; |
||||
return -1; |
||||
} |
||||
|
||||
uint64_t ticks = k_uptime_ticks(); |
||||
uint64_t elapsed_secs = ticks / CONFIG_SYS_CLOCK_TICKS_PER_SEC; |
||||
uint64_t nremainder = ticks - elapsed_secs * CONFIG_SYS_CLOCK_TICKS_PER_SEC; |
||||
|
||||
ts->tv_sec = (time_t)elapsed_secs; |
||||
/* For ns 32 bit conversion can be used since its smaller than 1sec. */ |
||||
ts->tv_nsec = (int32_t)k_ticks_to_ns_floor32(nremainder); |
||||
|
||||
if (unlikely(!timespec_normalize(ts)) || unlikely(!timespec_add(ts, &base))) { |
||||
errno = EOVERFLOW; |
||||
return -1; |
||||
} |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int z_clock_settime(clockid_t clock_id, const struct timespec *tp) |
||||
{ |
||||
struct timespec base; |
||||
|
||||
if (clock_id != CLOCK_REALTIME) { |
||||
errno = EINVAL; |
||||
return -1; |
||||
} |
||||
|
||||
if (!timespec_is_valid(tp)) { |
||||
errno = EINVAL; |
||||
return -1; |
||||
} |
||||
|
||||
uint64_t elapsed_nsecs = k_ticks_to_ns_floor64(k_uptime_ticks()); |
||||
int64_t delta = (int64_t)NSEC_PER_SEC * tp->tv_sec + tp->tv_nsec - elapsed_nsecs; |
||||
|
||||
base.tv_sec = delta / NSEC_PER_SEC; |
||||
base.tv_nsec = delta % NSEC_PER_SEC; |
||||
|
||||
if (unlikely(!timespec_normalize(&base))) { |
||||
errno = EOVERFLOW; |
||||
return -1; |
||||
} |
||||
|
||||
SYS_SEM_LOCK(&rt_clock_base_lock) { |
||||
rt_clock_base = base; |
||||
} |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int z_clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *rqtp, |
||||
struct timespec *rmtp) |
||||
{ |
||||
uint64_t ns; |
||||
uint64_t us; |
||||
uint64_t uptime_ns; |
||||
const bool update_rmtp = rmtp != NULL; |
||||
|
||||
if (!((clock_id == CLOCK_REALTIME) || (clock_id == CLOCK_MONOTONIC))) { |
||||
errno = EINVAL; |
||||
return -1; |
||||
} |
||||
|
||||
if (rqtp == NULL) { |
||||
errno = EFAULT; |
||||
return -1; |
||||
} |
||||
|
||||
if ((rqtp->tv_sec < 0) || !timespec_is_valid(rqtp)) { |
||||
errno = EINVAL; |
||||
return -1; |
||||
} |
||||
|
||||
if ((flags & TIMER_ABSTIME) == 0 && unlikely(rqtp->tv_sec >= ULLONG_MAX / NSEC_PER_SEC)) { |
||||
ns = rqtp->tv_nsec + NSEC_PER_SEC + |
||||
(uint64_t)k_sleep(K_SECONDS(rqtp->tv_sec - 1)) * NSEC_PER_MSEC; |
||||
} else { |
||||
ns = (uint64_t)rqtp->tv_sec * NSEC_PER_SEC + rqtp->tv_nsec; |
||||
} |
||||
|
||||
uptime_ns = k_ticks_to_ns_ceil64(sys_clock_tick_get()); |
||||
|
||||
if (flags & TIMER_ABSTIME && clock_id == CLOCK_REALTIME) { |
||||
SYS_SEM_LOCK(&rt_clock_base_lock) { |
||||
ns -= rt_clock_base.tv_sec * NSEC_PER_SEC + rt_clock_base.tv_nsec; |
||||
} |
||||
} |
||||
|
||||
if ((flags & TIMER_ABSTIME) == 0) { |
||||
ns += uptime_ns; |
||||
} |
||||
|
||||
if (ns <= uptime_ns) { |
||||
goto do_rmtp_update; |
||||
} |
||||
|
||||
us = DIV_ROUND_UP(ns, NSEC_PER_USEC); |
||||
do { |
||||
us = k_sleep(K_TIMEOUT_ABS_US(us)) * 1000; |
||||
} while (us != 0); |
||||
|
||||
do_rmtp_update: |
||||
if (update_rmtp) { |
||||
rmtp->tv_sec = 0; |
||||
rmtp->tv_nsec = 0; |
||||
} |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
#ifdef CONFIG_ZTEST |
||||
#include <zephyr/ztest.h> |
||||
static void reset_clock_base(void) |
||||
{ |
||||
SYS_SEM_LOCK(&rt_clock_base_lock) { |
||||
rt_clock_base = (struct timespec){0}; |
||||
} |
||||
} |
||||
|
||||
static void clock_base_reset_rule_after(const struct ztest_unit_test *test, void *data) |
||||
{ |
||||
ARG_UNUSED(test); |
||||
ARG_UNUSED(data); |
||||
|
||||
reset_clock_base(); |
||||
} |
||||
|
||||
ZTEST_RULE(clock_base_reset_rule, NULL, clock_base_reset_rule_after); |
||||
#endif /* CONFIG_ZTEST */ |
||||
Loading…
Reference in new issue