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

Merge pull request #11992 from JulianHolzwarth/pr/xtimer_mutex_lock_timeout/first_fix

Browse Source 
sys/xtimer/xtimer.c: _mutex_timeout() bug fix for race condition
This commit is contained in:
MichelRottleuthner 2019-12-04 10:43:20 +01:00 committed by GitHub
commit 272079c89e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/xtimer/xtimer.c
View File

@ -252,19 +252,22 @@ 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; if (mt->mutex->queue.next != MUTEX_LOCKED &&
list_node_t *node = list_remove(&mt->mutex->queue, mt->mutex->queue.next != NULL) {
(list_node_t *)&mt->thread->rq_entry); mt->timeout = 1;
list_node_t *node = list_remove(&mt->mutex->queue,
(list_node_t *)&mt->thread->rq_entry);
/* if thread was removed from the list */ /* if thread was removed from the list */
if (node != NULL) { if (node != NULL) {
if (mt->mutex->queue.next == NULL) { if (mt->mutex->queue.next == NULL) {
mt->mutex->queue.next = MUTEX_LOCKED; mt->mutex->queue.next = MUTEX_LOCKED;
}
sched_set_status(mt->thread, STATUS_PENDING);
irq_restore(irqstate);
sched_switch(mt->thread->priority);
return;
} }
sched_set_status(mt->thread, STATUS_PENDING);
irq_restore(irqstate);
sched_switch(mt->thread->priority);
return;
} }
irq_restore(irqstate); irq_restore(irqstate);
} }