RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #3640 from OlegHahm/mutex_unlock-errors

Browse Source 
core: missing restoreIRQ in mutex_unlock
This commit is contained in:
Kaspar Schleiser 2015-08-21 10:28:03 +02:00
commit 09c126b069
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/mutex.c
View File

@ -84,24 +84,30 @@ static void mutex_wait(struct mutex_t *mutex)
void mutex_unlock(struct mutex_t *mutex) void mutex_unlock(struct mutex_t *mutex)
{ {
DEBUG("%s: unlocking mutex. val: %u pid: %" PRIkernel_pid "\n", sched_active_thread->name, ATOMIC_VALUE(mutex->val), sched_active_pid);
unsigned irqstate = disableIRQ(); unsigned irqstate = disableIRQ();
DEBUG("mutex_unlock(): val: %u pid: %" PRIkernel_pid "\n", mutex->val, sched_active_pid);
if (ATOMIC_VALUE(mutex->val) == 0) {
/* the mutex was not locked */
restoreIRQ(irqstate);
return;
}
if (ATOMIC_VALUE(mutex->val) != 0) {
priority_queue_node_t *next = priority_queue_remove_head(&(mutex->queue)); priority_queue_node_t *next = priority_queue_remove_head(&(mutex->queue));
if (next) { if (!next) {
/* the mutex was locked and no thread was waiting for it */
ATOMIC_VALUE(mutex->val) = 0;
restoreIRQ(irqstate);
return;
}
tcb_t *process = (tcb_t *) next->data; tcb_t *process = (tcb_t *) next->data;
DEBUG("%s: waking up waiter.\n", process->name); DEBUG("mutex_unlock: waking up waiting thread %" PRIkernel_pid "\n", process->pid);
sched_set_status(process, STATUS_PENDING); sched_set_status(process, STATUS_PENDING);
sched_switch(process->priority); uint16_t process_priority = process->priority;
}
else {
ATOMIC_VALUE(mutex->val) = 0; /* This is safe, interrupts are disabled */
}
}
restoreIRQ(irqstate); restoreIRQ(irqstate);
sched_switch(process_priority);
} }
void mutex_unlock_and_sleep(struct mutex_t *mutex) void mutex_unlock_and_sleep(struct mutex_t *mutex)