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

Merge pull request #16374 from seeseemelk/master

Browse Source 
xtimer: Fix race condition in xtimer_msg_receive_timeout
This commit is contained in:
Kaspar Schleiser 2021-04-22 18:59:40 +02:00 committed by GitHub
commit 2229e95a3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/xtimer/xtimer.c
View File

@ -135,12 +135,12 @@ static void _setup_timer_msg(msg_t *m, xtimer_t *t)
static int _msg_wait(msg_t *m, msg_t *tmsg, xtimer_t *t) static int _msg_wait(msg_t *m, msg_t *tmsg, xtimer_t *t)
{ {
msg_receive(m); msg_receive(m);
xtimer_remove(t);
if (m->type == MSG_XTIMER && m->content.ptr == tmsg) { if (m->type == MSG_XTIMER && m->content.ptr == tmsg) {
/* we hit the timeout */ /* we hit the timeout */
return -1; return -1;
} }
else { else {
xtimer_remove(t);
return 1; return 1;
} }
} }