patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

kernel/mempool: Fix ticks/ms confusion

Browse source 
The mempool blocking implementation was mixing tick and millisecond
APIs.  Get it right.

Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
This commit is contained in:
Andy Ross 2019-06-16 17:23:25 -07:00 committed by Anas Nashif
parent ee4c23cc1f
commit 905209ba7d
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kernel/mempool.c
View file

@ -55,7 +55,7 @@ int k_mem_pool_alloc(struct k_mem_pool *p, struct k_mem_block *block,
__ASSERT(!(z_is_in_isr() && timeout != K_NO_WAIT), "");
if (timeout > 0) {
end = z_tick_get() + z_ms_to_ticks(timeout);
end = k_uptime_get() + timeout;
}
while (true) {
@ -93,9 +93,8 @@ int k_mem_pool_alloc(struct k_mem_pool *p, struct k_mem_block *block,
z_pend_curr_unlocked(&p->wait_q, timeout);
if (timeout != K_FOREVER) {
timeout = end - z_tick_get();
if (timeout < 0) {
timeout = end - k_uptime_get();
if (timeout <= 0) {
break;
}
}