Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 556 → Rev 557

/kernel/trunk/generic/src/synch/rwlock.c
26,9 → 26,10
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
 
/*
* Reader/Writer locks
/** Reader/Writer locks
*
* A reader/writer lock can be held by multiple readers at a time.
* Or it can be exclusively held by a sole writer at a time.
*/
 
/*
75,7 → 76,7
* @param rwl Reader/Writer lock.
*/
void rwlock_initialize(rwlock_t *rwl) {
spinlock_initialize(&rwl->lock, "rwlock");
spinlock_initialize(&rwl->lock, "rwlock_t");
mutex_initialize(&rwl->exclusive);
rwl->readers_in = 0;
}
218,10 → 219,10
interrupts_restore(ipl);
break;
case ESYNCH_OK_ATOMIC:
panic("_mutex_lock_timeout()==ESYNCH_OK_ATOMIC");
panic("_mutex_lock_timeout()==ESYNCH_OK_ATOMIC\n");
break;
dafault:
panic("invalid ESYNCH");
panic("invalid ESYNCH\n");
break;
}
return rc;
283,7 → 284,7
}
 
 
/** Direct handoff
/** Direct handoff of reader/writer lock ownership.
*
* Direct handoff of reader/writer lock ownership
* to waiting readers or a writer.
306,7 → 307,7
{
rwlock_type_t type = RWLOCK_NONE;
thread_t *t = NULL;
int one_more = 1;
bool one_more = true;
spinlock_lock(&rwl->exclusive.sem.wq.lock);
 
352,7 → 353,7
if (t) {
spinlock_lock(&t->lock);
if (t->rwlock_holder_type != RWLOCK_READER)
one_more = 0;
one_more = false;
spinlock_unlock(&t->lock);
}
}
/kernel/trunk/generic/src/synch/spinlock.c
62,9 → 62,10
*/
void spinlock_lock(spinlock_t *sl)
{
int i = 0;
count_t i = 0;
__address caller = ((__address *) &sl)[-1];
char *symbol;
bool deadlock_reported = false;
 
preemption_disable();
while (test_and_set(&sl->val)) {
76,9 → 77,13
printf("(%s)", symbol);
printf("\n");
i = 0;
deadlock_reported = true;
}
}
 
if (deadlock_reported)
printf("cpu%d: not deadlocked\n", CPU->id);
 
/*
* Prevent critical section code from bleeding out this way up.
*/
/kernel/trunk/generic/src/synch/waitq.c
33,6 → 33,7
#include <proc/scheduler.h>
#include <arch/asm.h>
#include <arch/types.h>
#include <typedefs.h>
#include <time/timeout.h>
#include <arch.h>
#include <context.h>
67,7 → 68,7
{
thread_t *t = (thread_t *) data;
waitq_t *wq;
int do_wakeup = 0;
bool do_wakeup = false;
 
spinlock_lock(&threads_lock);
if (!list_member(&t->threads_link, &threads_head))
75,24 → 76,25
 
grab_locks:
spinlock_lock(&t->lock);
if (wq = t->sleep_queue) {
if (wq = t->sleep_queue) { /* assignment */
if (!spinlock_trylock(&wq->lock)) {
spinlock_unlock(&t->lock);
goto grab_locks; /* avoid deadlock */
goto grab_locks; /* avoid deadlock */
}
 
list_remove(&t->wq_link);
t->saved_context = t->sleep_timeout_context;
do_wakeup = 1;
do_wakeup = true;
spinlock_unlock(&wq->lock);
t->sleep_queue = NULL;
}
t->timeout_pending = 0;
t->timeout_pending = false;
spinlock_unlock(&t->lock);
if (do_wakeup) thread_ready(t);
if (do_wakeup)
thread_ready(t);
 
out:
spinlock_unlock(&threads_lock);
193,7 → 195,7
interrupts_restore(ipl);
return ESYNCH_TIMEOUT;
}
THREAD->timeout_pending = 1;
THREAD->timeout_pending = true;
timeout_register(&THREAD->sleep_timeout, (__u64) usec, waitq_interrupted_sleep, THREAD);
}
 
227,7 → 229,7
* @param all If this is non-zero, all sleeping threads
* will be woken up and missed count will be zeroed.
*/
void waitq_wakeup(waitq_t *wq, int all)
void waitq_wakeup(waitq_t *wq, bool all)
{
ipl_t ipl;
 
250,7 → 252,7
* @param all If this is non-zero, all sleeping threads
* will be woken up and missed count will be zeroed.
*/
void _waitq_wakeup_unsafe(waitq_t *wq, int all)
void _waitq_wakeup_unsafe(waitq_t *wq, bool all)
{
thread_t *t;
 
257,7 → 259,8
loop:
if (list_empty(&wq->head)) {
wq->missed_wakeups++;
if (all) wq->missed_wakeups = 0;
if (all)
wq->missed_wakeups = 0;
return;
}
 
266,11 → 269,12
list_remove(&t->wq_link);
spinlock_lock(&t->lock);
if (t->timeout_pending && timeout_unregister(&t->sleep_timeout))
t->timeout_pending = 0;
t->timeout_pending = false;
t->sleep_queue = NULL;
spinlock_unlock(&t->lock);
 
thread_ready(t);
 
if (all) goto loop;
if (all)
goto loop;
}