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

core: allow DEBUG in mutex.c to run without DEVELHELP

Browse Source
This commit is contained in:
Martine Lenders 2016-04-08 22:30:44 +02:00
parent 040ad55f62
commit ccb4521599
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/mutex.c
View File

@ -40,18 +40,18 @@
int _mutex_lock(mutex_t *mutex, int blocking)
{
unsigned irqstate = irq_disable();
DEBUG("%s: Mutex in use.\n", sched_active_thread->name);
DEBUG("PID[%" PRIkernel_pid "]: Mutex in use.\n", sched_active_pid);
if (mutex->queue.next == NULL) {
/* mutex is unlocked. */
mutex->queue.next = MUTEX_LOCKED;
DEBUG("%s: mutex_wait early out.\n", sched_active_thread->name);
DEBUG("PID[%" PRIkernel_pid "]: mutex_wait early out.\n", sched_active_pid);
irq_restore(irqstate);
return 1;
}
else if (blocking) {
thread_t *me = (thread_t*) sched_active_thread;
DEBUG("%s: Adding node to mutex queue: prio: %" PRIu32 "\n", me->name, (uint32_t)me->priority);
DEBUG("PID[%" PRIkernel_pid "]: Adding node to mutex queue: prio: %" PRIu32 "\n", sched_active_pid, (uint32_t)me->priority);
sched_set_status(me, STATUS_MUTEX_BLOCKED);
if (mutex->queue.next == MUTEX_LOCKED) {
mutex->queue.next = (list_node_t*)&me->rq_entry;
@ -107,7 +107,8 @@ void mutex_unlock(mutex_t *mutex)
void mutex_unlock_and_sleep(mutex_t *mutex)
{
DEBUG("%s: unlocking mutex. queue.next: 0x%08x pid: %" PRIkernel_pid ", and taking a nap\n", sched_active_thread->name, (unsigned)mutex->queue.next, sched_active_pid);
DEBUG("PID[%" PRIkernel_pid "]: unlocking mutex. queue.next: 0x%08x, and "
"taking a nap\n", sched_active_pid, (unsigned)mutex->queue.next);
unsigned irqstate = irq_disable();
if (mutex->queue.next) {
@ -117,7 +118,7 @@ void mutex_unlock_and_sleep(mutex_t *mutex)
else {
list_node_t *next = list_remove_head(&mutex->queue);
thread_t *process = container_of((clist_node_t*)next, thread_t, rq_entry);
DEBUG("%s: waking up waiter.\n", process->name);
DEBUG("PID[%" PRIkernel_pid "]: waking up waiter.\n", process->pid);
sched_set_status(process, STATUS_PENDING);
if (!mutex->queue.next) {
mutex->queue.next = MUTEX_LOCKED;
@ -125,7 +126,7 @@ void mutex_unlock_and_sleep(mutex_t *mutex)
}
}
DEBUG("%s: going to sleep.\n", sched_active_thread->name);
DEBUG("PID[%" PRIkernel_pid "]: going to sleep.\n", sched_active_pid);
sched_set_status((thread_t*) sched_active_thread, STATUS_SLEEPING);
irq_restore(irqstate);
thread_yield_higher();