michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel/sched.c: refactor k_sleep() implementation for varied timescales

Browse source 
Current z_impl_k_sleep() does double duty, converting between units
specified by the API and ticks, as well as implementing the sleeping
mechanism itself. This patch separates the API from the mechanism,
so that sleeps need not be tied to millisecond timescales.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
This commit is contained in:
Charles E. Youse 2019-05-08 13:22:46 -07:00 • committed by Anas Nashif
commit b186303cb6
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
kernel/sched.c
View file

@ -912,24 +912,22 @@ void z_impl_k_yield(void)
Z_SYSCALL_HANDLER0_SIMPLE_VOID(k_yield); Z_SYSCALL_HANDLER0_SIMPLE_VOID(k_yield);
#endif #endif
s32_t z_impl_k_sleep(s32_t duration) static s32_t z_tick_sleep(s32_t ticks)
{ {
#ifdef CONFIG_MULTITHREADING #ifdef CONFIG_MULTITHREADING
u32_t expected_wakeup_time; u32_t expected_wakeup_time;
s32_t ticks;
__ASSERT(!z_is_in_isr(), ""); __ASSERT(!z_is_in_isr(), "");
__ASSERT(duration != K_FOREVER, "");
K_DEBUG("thread %p for %d ns\n", _current, duration); K_DEBUG("thread %p for %d ticks\n", _current, ticks);
/* wait of 0 ms is treated as a 'yield' */ /* wait of 0 ms is treated as a 'yield' */
if (duration == 0) { if (ticks == 0) {
k_yield(); k_yield();
return 0; return 0;
} }
ticks = _TICK_ALIGN + z_ms_to_ticks(duration); ticks += _TICK_ALIGN;
expected_wakeup_time = ticks + z_tick_get_32(); expected_wakeup_time = ticks + z_tick_get_32();
/* Spinlock purely for local interrupt locking to prevent us /* Spinlock purely for local interrupt locking to prevent us
@ -952,13 +950,24 @@ s32_t z_impl_k_sleep(s32_t duration)
ticks = expected_wakeup_time - z_tick_get_32(); ticks = expected_wakeup_time - z_tick_get_32();
if (ticks > 0) { if (ticks > 0) {
return __ticks_to_ms(ticks); return ticks;
} }
#endif #endif
return 0; return 0;
} }
s32_t z_impl_k_sleep(int ms)
{
s32_t ticks;
__ASSERT(ms != K_FOREVER, "");
ticks = z_ms_to_ticks(ms);
ticks = z_tick_sleep(ticks);
return __ticks_to_ms(ticks);
}
#ifdef CONFIG_USERSPACE #ifdef CONFIG_USERSPACE
Z_SYSCALL_HANDLER(k_sleep, duration) Z_SYSCALL_HANDLER(k_sleep, duration)
{ {