2017-12-18 08:41:03 +01:00
|
|
|
/*
|
|
|
|
|
* Copyright (c) 2017 Intel Corporation
|
|
|
|
|
*
|
|
|
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <kernel.h>
|
2018-04-05 19:11:15 +02:00
|
|
|
#include <ksched.h>
|
|
|
|
|
#include <wait_q.h>
|
|
|
|
|
#include <posix/time.h>
|
2017-12-18 08:41:03 +01:00
|
|
|
|
2020-02-26 01:06:23 +01:00
|
|
|
#ifdef CONFIG_POSIX_CLOCK
|
2020-05-27 18:26:57 +02:00
|
|
|
int64_t timespec_to_timeoutms(const struct timespec *abstime)
|
2018-03-19 15:25:42 +01:00
|
|
|
{
|
2020-05-27 18:26:57 +02:00
|
|
|
int64_t milli_secs, secs, nsecs;
|
2018-03-19 15:25:42 +01:00
|
|
|
struct timespec curtime;
|
|
|
|
|
|
|
|
|
|
/* FIXME: Zephyr does have CLOCK_REALTIME to get time.
|
|
|
|
|
* As per POSIX standard time should be calculated wrt CLOCK_REALTIME.
|
|
|
|
|
* Zephyr deviates from POSIX 1003.1 standard on this aspect.
|
|
|
|
|
*/
|
|
|
|
|
clock_gettime(CLOCK_MONOTONIC, &curtime);
|
|
|
|
|
secs = abstime->tv_sec - curtime.tv_sec;
|
|
|
|
|
nsecs = abstime->tv_nsec - curtime.tv_nsec;
|
|
|
|
|
|
|
|
|
|
if (secs < 0 || (secs == 0 && nsecs < NSEC_PER_MSEC)) {
|
kernel/timeout: Make timeout arguments an opaque type
Add a k_timeout_t type, and use it everywhere that kernel API
functions were accepting a millisecond timeout argument. Instead of
forcing milliseconds everywhere (which are often not integrally
representable as system ticks), do the conversion to ticks at the
point where the timeout is created. This avoids an extra unit
conversion in some application code, and allows us to express the
timeout in units other than milliseconds to achieve greater precision.
The existing K_MSEC() et. al. macros now return initializers for a
k_timeout_t.
The K_NO_WAIT and K_FOREVER constants have now become k_timeout_t
values, which means they cannot be operated on as integers.
Applications which have their own APIs that need to inspect these
vs. user-provided timeouts can now use a K_TIMEOUT_EQ() predicate to
test for equality.
Timer drivers, which receive an integer tick count in ther
z_clock_set_timeout() functions, now use the integer-valued
K_TICKS_FOREVER constant instead of K_FOREVER.
For the initial release, to preserve source compatibility, a
CONFIG_LEGACY_TIMEOUT_API kconfig is provided. When true, the
k_timeout_t will remain a compatible 32 bit value that will work with
any legacy Zephyr application.
Some subsystems present timeout (or timeout-like) values to their own
users as APIs that would re-use the kernel's own constants and
conventions. These will require some minor design work to adapt to
the new scheme (in most cases just using k_timeout_t directly in their
own API), and they have not been changed in this patch, instead
selecting CONFIG_LEGACY_TIMEOUT_API via kconfig. These subsystems
include: CAN Bus, the Microbit display driver, I2S, LoRa modem
drivers, the UART Async API, Video hardware drivers, the console
subsystem, and the network buffer abstraction.
k_sleep() now takes a k_timeout_t argument, with a k_msleep() variant
provided that works identically to the original API.
Most of the changes here are just type/configuration management and
documentation, but there are logic changes in mempool, where a loop
that used a timeout numerically has been reworked using a new
z_timeout_end_calc() predicate. Also in queue.c, a (when POLL was
enabled) a similar loop was needlessly used to try to retry the
k_poll() call after a spurious failure. But k_poll() does not fail
spuriously, so the loop was removed.
Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
2020-03-06 00:18:14 +01:00
|
|
|
milli_secs = 0;
|
2018-03-19 15:25:42 +01:00
|
|
|
} else {
|
|
|
|
|
milli_secs = secs * MSEC_PER_SEC + nsecs / NSEC_PER_MSEC;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return milli_secs;
|
|
|
|
|
}
|
2020-02-26 01:06:23 +01:00
|
|
|
#endif /* CONFIG_POSIX_CLOCK */
|
