riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xtimer: fix mutex unlocking in _mutex_timeout

Browse Source
This commit is contained in:
Vincent Dupont 2017-01-19 16:05:48 +01:00
parent 70fbcbf7ed
commit eacffdf490
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();
} }