michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: Wait queues aren't dlists anymore

Browse source 
These assertions snuck through in crossed pull requests.  There's a
specific API for _wait_q_t now, you can't hit the list directly
(because it might be a tree).

Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
This commit is contained in:
Andy Ross 2018-05-18 13:06:13 -07:00 • committed by Anas Nashif
commit 3ce9c84ba8
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/msg_q.c
View file

@ -99,7 +99,7 @@ Z_SYSCALL_HANDLER(k_msgq_alloc_init, q, msg_size, max_msgs)
void k_msgq_cleanup(struct k_msgq *q)
{
__ASSERT_NO_MSG(sys_dlist_is_empty(&q->wait_q.waitq));
__ASSERT_NO_MSG(!_waitq_head(&q->wait_q));
if (q->flags & K_MSGQ_FLAG_ALLOC) {
k_free(q->buffer_start);

4
kernel/pipes.c
View file

@ -175,8 +175,8 @@ Z_SYSCALL_HANDLER(k_pipe_alloc_init, pipe, size)
void k_pipe_cleanup(struct k_pipe *pipe)
{
__ASSERT_NO_MSG(sys_dlist_is_empty(&pipe->wait_q.readers.waitq));
__ASSERT_NO_MSG(sys_dlist_is_empty(&pipe->wait_q.writers.waitq));
__ASSERT_NO_MSG(!_waitq_head(&pipe->wait_q.readers));
__ASSERT_NO_MSG(!_waitq_head(&pipe->wait_q.writers));
if (pipe->flags & K_PIPE_FLAG_ALLOC) {
k_free(pipe->buffer);

2
kernel/stack.c
View file

@ -86,7 +86,7 @@ Z_SYSCALL_HANDLER(k_stack_alloc_init, stack, num_entries)
void k_stack_cleanup(struct k_stack *stack)
{
__ASSERT_NO_MSG(sys_dlist_is_empty(&stack->wait_q.waitq));
__ASSERT_NO_MSG(!_waitq_head(&stack->wait_q));
if (stack->flags & K_STACK_FLAG_ALLOC) {
k_free(stack->base);