michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: record when a fiber is removed from a wait queue

Browse source 
Until now, this was not needed since the checks for being on a wait
queue were only performed if a fiber was known to be on a timeout queue
as well. However, an upcoming fix for _fiber_wakeup() needs to verify if
a fiber is on a wait queue even if it is not timing out, because said
fix needs to check if the fiber is timing out as well.

Change-Id: If1694ceb551f2029d6a145963e81d3826956fd1d
Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
This commit is contained in:
Benjamin Walsh 2016-02-24 15:10:05 -05:00
commit 2aee77f8cf
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
kernel/nanokernel/include/timeout_q.h
View file

@ -40,12 +40,17 @@ static inline void _nano_timeout_tcs_init(struct tcs *tcs)
*/ */
tcs->nano_timeout.delta_ticks_from_prev = -1; tcs->nano_timeout.delta_ticks_from_prev = -1;
/*
* Must be initialized here so that the _fiber_wakeup family of APIs can
* verify the fiber is not on a wait queue before aborting a timeout.
*/
tcs->nano_timeout.wait_q = NULL;
/* /*
* These are initialized when enqueing on the timeout queue: * These are initialized when enqueing on the timeout queue:
* *
* tcs->nano_timeout.node.next * tcs->nano_timeout.node.next
* tcs->nano_timeout.node.prev * tcs->nano_timeout.node.prev
* tcs->nano_timeout.wait_q
*/ */
} }

2
kernel/nanokernel/include/wait_q.h
View file

@ -96,6 +96,8 @@ static inline void _nano_timeout_remove_tcs_from_wait_q(struct tcs *tcs)
wait_q->tail = prev; wait_q->tail = prev;
} }
} }
tcs->nano_timeout.wait_q = NULL;
} }
#include <timeout_q.h> #include <timeout_q.h>