kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-16 18:13:49 +01:00
Code Releases Activity

Merge pull request #6428 from OTAkeys/fix/xtimer_mutex_infinite_loop

Browse Source 
xtimer: fix mutex unlocking in _mutex_timeout
This commit is contained in:
Oleg Hahm 2017-01-20 16:43:38 +01:00 committed by GitHub
commit 9a38c1085c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/xtimer/xtimer.c
View File

@ -233,8 +233,12 @@ static void _mutex_timeout(void *arg)
mutex_thread_t *mt = (mutex_thread_t *)arg; mutex_thread_t *mt = (mutex_thread_t *)arg;
mt->timeout = 1; mt->timeout = 1;
list_node_t *node = list_remove(&mt->mutex->queue,
(list_node_t *)&mt->thread->rq_entry);
if ((node != NULL) && (mt->mutex->queue.next == NULL)) {
mt->mutex->queue.next = MUTEX_LOCKED;
}
sched_set_status(mt->thread, STATUS_PENDING); sched_set_status(mt->thread, STATUS_PENDING);
list_remove(&mt->mutex->queue, (list_node_t *)&mt->thread->rq_entry);
thread_yield_higher(); thread_yield_higher();
} }