kernel/timeoutq: Uninline the timeout methods
There was no good reason to have these rather large functions in a header. Put them into sys_clock.c for now, pending rework to the system. Now the API is clearly visible in a small header. Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
This commit is contained in:
Andy Ross
Anas Nashif
parent
7aae75bd1c
commit
1c08aefe56
3 changed files with 275 additions and 260 deletions
|
|
@ -10,12 +10,9 @@
|
||||||
/**
|
/**
|
||||||
* @file
|
* @file
|
||||||
* @brief timeout queue for threads on kernel objects
|
* @brief timeout queue for threads on kernel objects
|
||||||
*
|
|
||||||
* This file is meant to be included by kernel/include/wait_q.h only
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <misc/dlist.h>
|
#include <kernel.h>
|
||||||
#include <drivers/system_timer.h>
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
@ -23,268 +20,21 @@ extern "C" {
|
||||||
|
|
||||||
extern u64_t z_last_tick_announced;
|
extern u64_t z_last_tick_announced;
|
||||||
|
|
||||||
/* initialize the timeouts part of k_thread when enabled in the kernel */
|
void _init_timeout(struct _timeout *t, _timeout_func_t func);
|
||||||
|
|
||||||
static inline void _init_timeout(struct _timeout *t, _timeout_func_t func)
|
void _add_timeout(struct k_thread *thread, struct _timeout *timeout,
|
||||||
{
|
_wait_q_t *wait_q, s32_t timeout_in_ticks);
|
||||||
/*
|
|
||||||
* Must be initialized here and when dequeueing a timeout so that code
|
|
||||||
* not dealing with timeouts does not have to handle this, such as when
|
|
||||||
* waiting forever on a semaphore.
|
|
||||||
*/
|
|
||||||
t->delta_ticks_from_prev = _INACTIVE;
|
|
||||||
|
|
||||||
/*
|
int _abort_timeout(struct _timeout *timeout);
|
||||||
* Must be initialized here so that k_wakeup can
|
|
||||||
* verify the thread is not on a wait queue before aborting a timeout.
|
|
||||||
*/
|
|
||||||
t->wait_q = NULL;
|
|
||||||
|
|
||||||
/*
|
void _init_thread_timeout(struct _thread_base *thread_base);
|
||||||
* Must be initialized here, so the _handle_one_timeout()
|
|
||||||
* routine can check if there is a thread waiting on this timeout
|
|
||||||
*/
|
|
||||||
t->thread = NULL;
|
|
||||||
|
|
||||||
/*
|
void _add_thread_timeout(struct k_thread *thread, _wait_q_t *wait_q,
|
||||||
* Function must be initialized before being potentially called.
|
s32_t timeout_in_ticks);
|
||||||
*/
|
|
||||||
t->func = func;
|
|
||||||
|
|
||||||
/*
|
int _abort_thread_timeout(struct k_thread *thread);
|
||||||
* These are initialized when enqueing on the timeout queue:
|
|
||||||
*
|
|
||||||
* thread->timeout.node.next
|
|
||||||
* thread->timeout.node.prev
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
static ALWAYS_INLINE void
|
s32_t _get_next_timeout_expiry(void);
|
||||||
_init_thread_timeout(struct _thread_base *thread_base)
|
|
||||||
{
|
|
||||||
_init_timeout(&thread_base->timeout, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* remove a thread timing out from kernel object's wait queue */
|
|
||||||
|
|
||||||
static inline void _unpend_thread_timing_out(struct k_thread *thread,
|
|
||||||
struct _timeout *timeout_obj)
|
|
||||||
{
|
|
||||||
if (timeout_obj->wait_q != NULL) {
|
|
||||||
_unpend_thread_no_timeout(thread);
|
|
||||||
thread->base.timeout.wait_q = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Handle one timeout from the expired timeout queue. Removes it from the wait
|
|
||||||
* queue it is on if waiting for an object; in this case, the return value is
|
|
||||||
* kept as -EAGAIN, set previously in _Swap().
|
|
||||||
*/
|
|
||||||
|
|
||||||
static inline void _handle_one_expired_timeout(struct _timeout *timeout)
|
|
||||||
{
|
|
||||||
struct k_thread *thread = timeout->thread;
|
|
||||||
unsigned int key = irq_lock();
|
|
||||||
|
|
||||||
timeout->delta_ticks_from_prev = _INACTIVE;
|
|
||||||
|
|
||||||
K_DEBUG("timeout %p\n", timeout);
|
|
||||||
if (thread != NULL) {
|
|
||||||
_unpend_thread_timing_out(thread, timeout);
|
|
||||||
_mark_thread_as_started(thread);
|
|
||||||
_ready_thread(thread);
|
|
||||||
irq_unlock(key);
|
|
||||||
} else {
|
|
||||||
irq_unlock(key);
|
|
||||||
if (timeout->func != NULL) {
|
|
||||||
timeout->func(timeout);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Loop over all expired timeouts and handle them one by one. Should be called
|
|
||||||
* with interrupts unlocked: interrupts will be locked on each interation only
|
|
||||||
* for the amount of time necessary.
|
|
||||||
*/
|
|
||||||
|
|
||||||
static inline void _handle_expired_timeouts(sys_dlist_t *expired)
|
|
||||||
{
|
|
||||||
struct _timeout *timeout, *next;
|
|
||||||
|
|
||||||
SYS_DLIST_FOR_EACH_CONTAINER_SAFE(expired, timeout, next, node) {
|
|
||||||
_handle_one_expired_timeout(timeout);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* returns _INACTIVE if the timer is not active */
|
|
||||||
static inline int _abort_timeout(struct _timeout *timeout)
|
|
||||||
{
|
|
||||||
if (timeout->delta_ticks_from_prev == _INACTIVE) {
|
|
||||||
return _INACTIVE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!sys_dlist_is_tail(&_timeout_q, &timeout->node)) {
|
|
||||||
sys_dnode_t *next_node =
|
|
||||||
sys_dlist_peek_next(&_timeout_q, &timeout->node);
|
|
||||||
struct _timeout *next = (struct _timeout *)next_node;
|
|
||||||
|
|
||||||
next->delta_ticks_from_prev += timeout->delta_ticks_from_prev;
|
|
||||||
}
|
|
||||||
sys_dlist_remove(&timeout->node);
|
|
||||||
timeout->delta_ticks_from_prev = _INACTIVE;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* returns _INACTIVE if the timer has already expired */
|
|
||||||
static inline int _abort_thread_timeout(struct k_thread *thread)
|
|
||||||
{
|
|
||||||
return _abort_timeout(&thread->base.timeout);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void _dump_timeout(struct _timeout *timeout, int extra_tab)
|
|
||||||
{
|
|
||||||
#ifdef CONFIG_KERNEL_DEBUG
|
|
||||||
char *tab = extra_tab ? "\t" : "";
|
|
||||||
|
|
||||||
K_DEBUG("%stimeout %p, prev: %p, next: %p\n"
|
|
||||||
"%s\tthread: %p, wait_q: %p\n"
|
|
||||||
"%s\tticks remaining: %d\n"
|
|
||||||
"%s\tfunction: %p\n",
|
|
||||||
tab, timeout, timeout->node.prev, timeout->node.next,
|
|
||||||
tab, timeout->thread, timeout->wait_q,
|
|
||||||
tab, timeout->delta_ticks_from_prev,
|
|
||||||
tab, timeout->func);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void _dump_timeout_q(void)
|
|
||||||
{
|
|
||||||
#ifdef CONFIG_KERNEL_DEBUG
|
|
||||||
struct _timeout *timeout;
|
|
||||||
|
|
||||||
K_DEBUG("_timeout_q: %p, head: %p, tail: %p\n",
|
|
||||||
&_timeout_q, _timeout_q.head, _timeout_q.tail);
|
|
||||||
|
|
||||||
SYS_DLIST_FOR_EACH_CONTAINER(&_timeout_q, timeout, node) {
|
|
||||||
_dump_timeout(timeout, 1);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/* find the closest deadline in the timeout queue */
|
|
||||||
|
|
||||||
static inline s32_t _get_next_timeout_expiry(void)
|
|
||||||
{
|
|
||||||
struct _timeout *t = (struct _timeout *)
|
|
||||||
sys_dlist_peek_head(&_timeout_q);
|
|
||||||
|
|
||||||
return t ? t->delta_ticks_from_prev : K_FOREVER;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Add timeout to timeout queue. Record waiting thread and wait queue if any.
|
|
||||||
*
|
|
||||||
* Cannot handle timeout == 0 and timeout == K_FOREVER.
|
|
||||||
*
|
|
||||||
* If the new timeout is expiring on the same system clock tick as other
|
|
||||||
* timeouts already present in the _timeout_q, it is be _prepended_ to these
|
|
||||||
* timeouts. This allows exiting the loop sooner, which is good, since
|
|
||||||
* interrupts are locked while trying to find the insert point. Note that the
|
|
||||||
* timeouts are then processed in the _reverse order_ if they expire on the
|
|
||||||
* same tick.
|
|
||||||
*
|
|
||||||
* This should not cause problems to applications, unless they really expect
|
|
||||||
* two timeouts queued very close to one another to expire in the same order
|
|
||||||
* they were queued. This could be changed at the cost of potential longer
|
|
||||||
* interrupt latency.
|
|
||||||
*
|
|
||||||
* Must be called with interrupts locked.
|
|
||||||
*/
|
|
||||||
|
|
||||||
static inline void _add_timeout(struct k_thread *thread,
|
|
||||||
struct _timeout *timeout,
|
|
||||||
_wait_q_t *wait_q,
|
|
||||||
s32_t timeout_in_ticks)
|
|
||||||
{
|
|
||||||
__ASSERT(timeout_in_ticks >= 0, "");
|
|
||||||
|
|
||||||
timeout->delta_ticks_from_prev = timeout_in_ticks;
|
|
||||||
timeout->thread = thread;
|
|
||||||
timeout->wait_q = (sys_dlist_t *)wait_q;
|
|
||||||
|
|
||||||
K_DEBUG("before adding timeout %p\n", timeout);
|
|
||||||
_dump_timeout(timeout, 0);
|
|
||||||
_dump_timeout_q();
|
|
||||||
|
|
||||||
/* If timer is submitted to expire ASAP with
|
|
||||||
* timeout_in_ticks (duration) as zero value,
|
|
||||||
* then handle timeout immedately without going
|
|
||||||
* through timeout queue.
|
|
||||||
*/
|
|
||||||
if (!timeout_in_ticks) {
|
|
||||||
_handle_one_expired_timeout(timeout);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32_t *delta = &timeout->delta_ticks_from_prev;
|
|
||||||
struct _timeout *in_q;
|
|
||||||
|
|
||||||
#ifdef CONFIG_TICKLESS_KERNEL
|
|
||||||
/*
|
|
||||||
* If some time has already passed since timer was last
|
|
||||||
* programmed, then that time needs to be accounted when
|
|
||||||
* inserting the new timeout. We account for this
|
|
||||||
* by adding the already elapsed time to the new timeout.
|
|
||||||
* This is like adding this timout back in history.
|
|
||||||
*/
|
|
||||||
u32_t adjusted_timeout;
|
|
||||||
|
|
||||||
*delta += (int)(z_clock_uptime() - z_last_tick_announced);
|
|
||||||
|
|
||||||
adjusted_timeout = *delta;
|
|
||||||
#endif
|
|
||||||
SYS_DLIST_FOR_EACH_CONTAINER(&_timeout_q, in_q, node) {
|
|
||||||
if (*delta <= in_q->delta_ticks_from_prev) {
|
|
||||||
in_q->delta_ticks_from_prev -= *delta;
|
|
||||||
sys_dlist_insert_before(&_timeout_q, &in_q->node,
|
|
||||||
&timeout->node);
|
|
||||||
goto inserted;
|
|
||||||
}
|
|
||||||
|
|
||||||
*delta -= in_q->delta_ticks_from_prev;
|
|
||||||
}
|
|
||||||
|
|
||||||
sys_dlist_append(&_timeout_q, &timeout->node);
|
|
||||||
|
|
||||||
inserted:
|
|
||||||
K_DEBUG("after adding timeout %p\n", timeout);
|
|
||||||
_dump_timeout(timeout, 0);
|
|
||||||
_dump_timeout_q();
|
|
||||||
|
|
||||||
#ifdef CONFIG_TICKLESS_KERNEL
|
|
||||||
if (adjusted_timeout < _get_next_timeout_expiry()) {
|
|
||||||
z_clock_set_timeout(adjusted_timeout, false);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Put thread on timeout queue. Record wait queue if any.
|
|
||||||
*
|
|
||||||
* Cannot handle timeout == 0 and timeout == K_FOREVER.
|
|
||||||
*
|
|
||||||
* Must be called with interrupts locked.
|
|
||||||
*/
|
|
||||||
|
|
||||||
static inline void _add_thread_timeout(struct k_thread *thread,
|
|
||||||
_wait_q_t *wait_q,
|
|
||||||
s32_t timeout_in_ticks)
|
|
||||||
{
|
|
||||||
_add_timeout(thread, &thread->base.timeout, wait_q, timeout_in_ticks);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@
|
||||||
#include <kswap.h>
|
#include <kswap.h>
|
||||||
#include <kernel_arch_func.h>
|
#include <kernel_arch_func.h>
|
||||||
#include <syscall_handler.h>
|
#include <syscall_handler.h>
|
||||||
|
#include <drivers/system_timer.h>
|
||||||
|
|
||||||
#if defined(CONFIG_SCHED_DUMB)
|
#if defined(CONFIG_SCHED_DUMB)
|
||||||
#define _priq_run_add _priq_dumb_add
|
#define _priq_run_add _priq_dumb_add
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,8 @@ int _sys_clock_always_on = 1;
|
||||||
static u32_t next_ts;
|
static u32_t next_ts;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
static void _handle_expired_timeouts(sys_dlist_t *expired);
|
||||||
|
|
||||||
u32_t z_tick_get_32(void)
|
u32_t z_tick_get_32(void)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_TICKLESS_KERNEL
|
#ifdef CONFIG_TICKLESS_KERNEL
|
||||||
|
|
@ -351,3 +353,265 @@ void k_disable_sys_clock_always_on(void)
|
||||||
_sys_clock_always_on = 0;
|
_sys_clock_always_on = 0;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
extern u64_t z_last_tick_announced;
|
||||||
|
|
||||||
|
/* initialize the timeouts part of k_thread when enabled in the kernel */
|
||||||
|
|
||||||
|
void _init_timeout(struct _timeout *t, _timeout_func_t func)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Must be initialized here and when dequeueing a timeout so that code
|
||||||
|
* not dealing with timeouts does not have to handle this, such as when
|
||||||
|
* waiting forever on a semaphore.
|
||||||
|
*/
|
||||||
|
t->delta_ticks_from_prev = _INACTIVE;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Must be initialized here so that k_wakeup can
|
||||||
|
* verify the thread is not on a wait queue before aborting a timeout.
|
||||||
|
*/
|
||||||
|
t->wait_q = NULL;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Must be initialized here, so the _handle_one_timeout()
|
||||||
|
* routine can check if there is a thread waiting on this timeout
|
||||||
|
*/
|
||||||
|
t->thread = NULL;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Function must be initialized before being potentially called.
|
||||||
|
*/
|
||||||
|
t->func = func;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* These are initialized when enqueing on the timeout queue:
|
||||||
|
*
|
||||||
|
* thread->timeout.node.next
|
||||||
|
* thread->timeout.node.prev
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
|
void _init_thread_timeout(struct _thread_base *thread_base)
|
||||||
|
{
|
||||||
|
_init_timeout(&thread_base->timeout, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* remove a thread timing out from kernel object's wait queue */
|
||||||
|
|
||||||
|
static inline void _unpend_thread_timing_out(struct k_thread *thread,
|
||||||
|
struct _timeout *timeout_obj)
|
||||||
|
{
|
||||||
|
if (timeout_obj->wait_q) {
|
||||||
|
_unpend_thread_no_timeout(thread);
|
||||||
|
thread->base.timeout.wait_q = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Handle one timeout from the expired timeout queue. Removes it from the wait
|
||||||
|
* queue it is on if waiting for an object; in this case, the return value is
|
||||||
|
* kept as -EAGAIN, set previously in _Swap().
|
||||||
|
*/
|
||||||
|
|
||||||
|
static inline void _handle_one_expired_timeout(struct _timeout *timeout)
|
||||||
|
{
|
||||||
|
struct k_thread *thread = timeout->thread;
|
||||||
|
unsigned int key = irq_lock();
|
||||||
|
|
||||||
|
timeout->delta_ticks_from_prev = _INACTIVE;
|
||||||
|
|
||||||
|
K_DEBUG("timeout %p\n", timeout);
|
||||||
|
if (thread) {
|
||||||
|
_unpend_thread_timing_out(thread, timeout);
|
||||||
|
_mark_thread_as_started(thread);
|
||||||
|
_ready_thread(thread);
|
||||||
|
irq_unlock(key);
|
||||||
|
} else {
|
||||||
|
irq_unlock(key);
|
||||||
|
if (timeout->func) {
|
||||||
|
timeout->func(timeout);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Loop over all expired timeouts and handle them one by one. Should be called
|
||||||
|
* with interrupts unlocked: interrupts will be locked on each interation only
|
||||||
|
* for the amount of time necessary.
|
||||||
|
*/
|
||||||
|
|
||||||
|
static void _handle_expired_timeouts(sys_dlist_t *expired)
|
||||||
|
{
|
||||||
|
struct _timeout *timeout, *next;
|
||||||
|
|
||||||
|
SYS_DLIST_FOR_EACH_CONTAINER_SAFE(expired, timeout, next, node) {
|
||||||
|
_handle_one_expired_timeout(timeout);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* returns _INACTIVE if the timer is not active */
|
||||||
|
int _abort_timeout(struct _timeout *timeout)
|
||||||
|
{
|
||||||
|
if (timeout->delta_ticks_from_prev == _INACTIVE) {
|
||||||
|
return _INACTIVE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!sys_dlist_is_tail(&_timeout_q, &timeout->node)) {
|
||||||
|
sys_dnode_t *next_node =
|
||||||
|
sys_dlist_peek_next(&_timeout_q, &timeout->node);
|
||||||
|
struct _timeout *next = (struct _timeout *)next_node;
|
||||||
|
|
||||||
|
next->delta_ticks_from_prev += timeout->delta_ticks_from_prev;
|
||||||
|
}
|
||||||
|
sys_dlist_remove(&timeout->node);
|
||||||
|
timeout->delta_ticks_from_prev = _INACTIVE;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* returns _INACTIVE if the timer has already expired */
|
||||||
|
int _abort_thread_timeout(struct k_thread *thread)
|
||||||
|
{
|
||||||
|
return _abort_timeout(&thread->base.timeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void _dump_timeout(struct _timeout *timeout, int extra_tab)
|
||||||
|
{
|
||||||
|
#ifdef CONFIG_KERNEL_DEBUG
|
||||||
|
char *tab = extra_tab ? "\t" : "";
|
||||||
|
|
||||||
|
K_DEBUG("%stimeout %p, prev: %p, next: %p\n"
|
||||||
|
"%s\tthread: %p, wait_q: %p\n"
|
||||||
|
"%s\tticks remaining: %d\n"
|
||||||
|
"%s\tfunction: %p\n",
|
||||||
|
tab, timeout, timeout->node.prev, timeout->node.next,
|
||||||
|
tab, timeout->thread, timeout->wait_q,
|
||||||
|
tab, timeout->delta_ticks_from_prev,
|
||||||
|
tab, timeout->func);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void _dump_timeout_q(void)
|
||||||
|
{
|
||||||
|
#ifdef CONFIG_KERNEL_DEBUG
|
||||||
|
struct _timeout *timeout;
|
||||||
|
|
||||||
|
K_DEBUG("_timeout_q: %p, head: %p, tail: %p\n",
|
||||||
|
&_timeout_q, _timeout_q.head, _timeout_q.tail);
|
||||||
|
|
||||||
|
SYS_DLIST_FOR_EACH_CONTAINER(&_timeout_q, timeout, node) {
|
||||||
|
_dump_timeout(timeout, 1);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
/* find the closest deadline in the timeout queue */
|
||||||
|
|
||||||
|
s32_t _get_next_timeout_expiry(void)
|
||||||
|
{
|
||||||
|
struct _timeout *t = (struct _timeout *)
|
||||||
|
sys_dlist_peek_head(&_timeout_q);
|
||||||
|
|
||||||
|
return t ? t->delta_ticks_from_prev : K_FOREVER;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Add timeout to timeout queue. Record waiting thread and wait queue if any.
|
||||||
|
*
|
||||||
|
* Cannot handle timeout == 0 and timeout == K_FOREVER.
|
||||||
|
*
|
||||||
|
* If the new timeout is expiring on the same system clock tick as other
|
||||||
|
* timeouts already present in the _timeout_q, it is be _prepended_ to these
|
||||||
|
* timeouts. This allows exiting the loop sooner, which is good, since
|
||||||
|
* interrupts are locked while trying to find the insert point. Note that the
|
||||||
|
* timeouts are then processed in the _reverse order_ if they expire on the
|
||||||
|
* same tick.
|
||||||
|
*
|
||||||
|
* This should not cause problems to applications, unless they really expect
|
||||||
|
* two timeouts queued very close to one another to expire in the same order
|
||||||
|
* they were queued. This could be changed at the cost of potential longer
|
||||||
|
* interrupt latency.
|
||||||
|
*
|
||||||
|
* Must be called with interrupts locked.
|
||||||
|
*/
|
||||||
|
|
||||||
|
void _add_timeout(struct k_thread *thread, struct _timeout *timeout,
|
||||||
|
_wait_q_t *wait_q, s32_t timeout_in_ticks)
|
||||||
|
{
|
||||||
|
__ASSERT(timeout_in_ticks >= 0, "");
|
||||||
|
|
||||||
|
timeout->delta_ticks_from_prev = timeout_in_ticks;
|
||||||
|
timeout->thread = thread;
|
||||||
|
timeout->wait_q = (sys_dlist_t *)wait_q;
|
||||||
|
|
||||||
|
K_DEBUG("before adding timeout %p\n", timeout);
|
||||||
|
_dump_timeout(timeout, 0);
|
||||||
|
_dump_timeout_q();
|
||||||
|
|
||||||
|
/* If timer is submitted to expire ASAP with
|
||||||
|
* timeout_in_ticks (duration) as zero value,
|
||||||
|
* then handle timeout immedately without going
|
||||||
|
* through timeout queue.
|
||||||
|
*/
|
||||||
|
if (!timeout_in_ticks) {
|
||||||
|
_handle_one_expired_timeout(timeout);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
s32_t *delta = &timeout->delta_ticks_from_prev;
|
||||||
|
struct _timeout *in_q;
|
||||||
|
|
||||||
|
#ifdef CONFIG_TICKLESS_KERNEL
|
||||||
|
/*
|
||||||
|
* If some time has already passed since timer was last
|
||||||
|
* programmed, then that time needs to be accounted when
|
||||||
|
* inserting the new timeout. We account for this
|
||||||
|
* by adding the already elapsed time to the new timeout.
|
||||||
|
* This is like adding this timout back in history.
|
||||||
|
*/
|
||||||
|
u32_t adjusted_timeout;
|
||||||
|
|
||||||
|
*delta += (int)(z_clock_uptime() - z_last_tick_announced);
|
||||||
|
|
||||||
|
adjusted_timeout = *delta;
|
||||||
|
#endif
|
||||||
|
SYS_DLIST_FOR_EACH_CONTAINER(&_timeout_q, in_q, node) {
|
||||||
|
if (*delta <= in_q->delta_ticks_from_prev) {
|
||||||
|
in_q->delta_ticks_from_prev -= *delta;
|
||||||
|
sys_dlist_insert_before(&_timeout_q, &in_q->node,
|
||||||
|
&timeout->node);
|
||||||
|
goto inserted;
|
||||||
|
}
|
||||||
|
|
||||||
|
*delta -= in_q->delta_ticks_from_prev;
|
||||||
|
}
|
||||||
|
|
||||||
|
sys_dlist_append(&_timeout_q, &timeout->node);
|
||||||
|
|
||||||
|
inserted:
|
||||||
|
K_DEBUG("after adding timeout %p\n", timeout);
|
||||||
|
_dump_timeout(timeout, 0);
|
||||||
|
_dump_timeout_q();
|
||||||
|
|
||||||
|
#ifdef CONFIG_TICKLESS_KERNEL
|
||||||
|
if (adjusted_timeout < _get_next_timeout_expiry()) {
|
||||||
|
z_clock_set_timeout(adjusted_timeout, false);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Put thread on timeout queue. Record wait queue if any.
|
||||||
|
*
|
||||||
|
* Cannot handle timeout == 0 and timeout == K_FOREVER.
|
||||||
|
*
|
||||||
|
* Must be called with interrupts locked.
|
||||||
|
*/
|
||||||
|
|
||||||
|
void _add_thread_timeout(struct k_thread *thread,
|
||||||
|
_wait_q_t *wait_q,
|
||||||
|
s32_t timeout_in_ticks)
|
||||||
|
{
|
||||||
|
_add_timeout(thread, &thread->base.timeout, wait_q, timeout_in_ticks);
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue