| /branches/network/kernel/generic/src/synch/rwlock.c |
|---|
| 231,10 → 231,10 |
| interrupts_restore(ipl); |
| break; |
| case ESYNCH_OK_ATOMIC: |
| panic("_mutex_lock_timeout() == ESYNCH_OK_ATOMIC\n"); |
| panic("_mutex_lock_timeout() == ESYNCH_OK_ATOMIC."); |
| break; |
| default: |
| panic("invalid ESYNCH\n"); |
| panic("Invalid ESYNCH."); |
| break; |
| } |
| return rc; |
| /branches/network/kernel/generic/src/synch/spinlock.c |
|---|
| 76,7 → 76,6 |
| void spinlock_lock_debug(spinlock_t *sl) |
| { |
| count_t i = 0; |
| char *symbol; |
| bool deadlock_reported = false; |
| preemption_disable(); |
| 106,12 → 105,10 |
| continue; |
| #endif |
| if (i++ > DEADLOCK_THRESHOLD) { |
| printf("cpu%u: looping on spinlock %" PRIp ":%s, caller=%" PRIp, |
| CPU->id, sl, sl->name, CALLER); |
| symbol = get_symtab_entry(CALLER); |
| if (symbol) |
| printf("(%s)", symbol); |
| printf("\n"); |
| printf("cpu%u: looping on spinlock %" PRIp ":%s, " |
| "caller=%" PRIp "(%s)", CPU->id, sl, sl->name, |
| CALLER, symtab_fmt_name_lookup(CALLER)); |
| i = 0; |
| deadlock_reported = true; |
| } |
| /branches/network/kernel/generic/src/synch/futex.c |
|---|
| 115,6 → 115,7 |
| uintptr_t paddr; |
| pte_t *t; |
| ipl_t ipl; |
| int rc; |
| ipl = interrupts_disable(); |
| 134,9 → 135,17 |
| interrupts_restore(ipl); |
| futex = futex_find(paddr); |
| return (unative_t) waitq_sleep_timeout(&futex->wq, usec, flags | |
| #ifdef CONFIG_UDEBUG |
| udebug_stoppable_begin(); |
| #endif |
| rc = waitq_sleep_timeout(&futex->wq, usec, flags | |
| SYNCH_FLAGS_INTERRUPTIBLE); |
| #ifdef CONFIG_UDEBUG |
| udebug_stoppable_end(); |
| #endif |
| return (unative_t) rc; |
| } |
| /** Wakeup one thread waiting in futex wait queue. |