xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

kernel: cleanup qlock.c to use nil instead of 0 for pointers

Browse source
This commit is contained in:
cinap_lenrek 2015-08-02 05:36:35 +02:00
parent dd96b1d965
commit 27445c5768
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
sys/src/9/port/qlock.c
View file

@ -24,7 +24,7 @@ eqlock(QLock *q)
print("eqlock: %#p: ilockdepth %d\n", getcallerpc(&q), m->ilockdepth); print("eqlock: %#p: ilockdepth %d\n", getcallerpc(&q), m->ilockdepth);
if(up != nil && up->nlocks) if(up != nil && up->nlocks)
print("eqlock: %#p: nlocks %d\n", getcallerpc(&q), up->nlocks); print("eqlock: %#p: nlocks %d\n", getcallerpc(&q), up->nlocks);
if(up != nil && up->eql) if(up != nil && up->eql != nil)
print("eqlock: %#p: eql %p\n", getcallerpc(&q), up->eql); print("eqlock: %#p: eql %p\n", getcallerpc(&q), up->eql);
if(q->use.key == 0x55555555) if(q->use.key == 0x55555555)
panic("eqlock: q %#p, key 5*", q); panic("eqlock: q %#p, key 5*", q);
@ -36,7 +36,7 @@ eqlock(QLock *q)
unlock(&q->use); unlock(&q->use);
return; return;
} }
if(up == 0) if(up == nil)
panic("eqlock"); panic("eqlock");
if(up->notepending){ if(up->notepending){
up->notepending = 0; up->notepending = 0;
@ -45,22 +45,22 @@ eqlock(QLock *q)
} }
rwstats.qlockq++; rwstats.qlockq++;
p = q->tail; p = q->tail;
if(p == 0) if(p == nil)
q->head = up; q->head = up;
else else
p->qnext = up; p->qnext = up;
q->tail = up; q->tail = up;
up->eql = q; up->eql = q;
up->qnext = 0; up->qnext = nil;
up->qpc = getcallerpc(&q); up->qpc = getcallerpc(&q);
up->state = Queueing; up->state = Queueing;
unlock(&q->use); unlock(&q->use);
sched(); sched();
if(up->eql == 0){ if(up->eql == nil){
up->notepending = 0; up->notepending = 0;
interrupted(); interrupted();
} }
up->eql = 0; up->eql = nil;
} }
void void
@ -72,7 +72,7 @@ qlock(QLock *q)
print("qlock: %#p: ilockdepth %d\n", getcallerpc(&q), m->ilockdepth); print("qlock: %#p: ilockdepth %d\n", getcallerpc(&q), m->ilockdepth);
if(up != nil && up->nlocks) if(up != nil && up->nlocks)
print("qlock: %#p: nlocks %d\n", getcallerpc(&q), up->nlocks); print("qlock: %#p: nlocks %d\n", getcallerpc(&q), up->nlocks);
if(up != nil && up->eql) if(up != nil && up->eql != nil)
print("qlock: %#p: eql %p\n", getcallerpc(&q), up->eql); print("qlock: %#p: eql %p\n", getcallerpc(&q), up->eql);
if(q->use.key == 0x55555555) if(q->use.key == 0x55555555)
panic("qlock: q %#p, key 5*", q); panic("qlock: q %#p, key 5*", q);
@ -83,17 +83,17 @@ qlock(QLock *q)
unlock(&q->use); unlock(&q->use);
return; return;
} }
if(up == 0) if(up == nil)
panic("qlock"); panic("qlock");
rwstats.qlockq++; rwstats.qlockq++;
p = q->tail; p = q->tail;
if(p == 0) if(p == nil)
q->head = up; q->head = up;
else else
p->qnext = up; p->qnext = up;
q->tail = up; q->tail = up;
up->eql = 0; up->eql = nil;
up->qnext = 0; up->qnext = nil;
up->state = Queueing; up->state = Queueing;
up->qpc = getcallerpc(&q); up->qpc = getcallerpc(&q);
unlock(&q->use); unlock(&q->use);
@ -124,10 +124,10 @@ qunlock(QLock *q)
print("qunlock called with qlock not held, from %#p\n", print("qunlock called with qlock not held, from %#p\n",
getcallerpc(&q)); getcallerpc(&q));
p = q->head; p = q->head;
if(p){ if(p != nil){
q->head = p->qnext; q->head = p->qnext;
if(q->head == 0) if(q->head == nil)
q->tail = 0; q->tail = nil;
unlock(&q->use); unlock(&q->use);
ready(p); ready(p);
return; return;
@ -154,12 +154,12 @@ rlock(RWlock *q)
p = q->tail; p = q->tail;
if(up == nil) if(up == nil)
panic("rlock"); panic("rlock");
if(p == 0) if(p == nil)
q->head = up; q->head = up;
else else
p->qnext = up; p->qnext = up;
q->tail = up; q->tail = up;
up->qnext = 0; up->qnext = nil;
up->state = QueueingR; up->state = QueueingR;
unlock(&q->use); unlock(&q->use);
sched(); sched();
@ -181,8 +181,8 @@ runlock(RWlock *q)
if(p->state != QueueingW) if(p->state != QueueingW)
panic("runlock"); panic("runlock");
q->head = p->qnext; q->head = p->qnext;
if(q->head == 0) if(q->head == nil)
q->tail = 0; q->tail = nil;
q->writer = 1; q->writer = 1;
unlock(&q->use); unlock(&q->use);
ready(p); ready(p);
@ -214,7 +214,7 @@ wlock(RWlock *q)
else else
p->qnext = up; p->qnext = up;
q->tail = up; q->tail = up;
up->qnext = 0; up->qnext = nil;
up->state = QueueingW; up->state = QueueingW;
unlock(&q->use); unlock(&q->use);
sched(); sched();