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

kernel: dont spawn closeprocs from closechanq

Browse source 
make closeproc() spawn more procs on demand insead of
doing it from closechanq(). this avoids the palloc lock
checks and simplifies the logic.
This commit is contained in:
cinap_lenrek 2013-10-25 19:51:46 +02:00
parent c7c7e7ee2a
commit 8cdade591e
1 changed files with 51 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
sys/src/9/port/chan.c
View file

@ -480,7 +480,7 @@ struct {
Chan *head;
Chan *tail;
ulong nqueued;
ulong nclosed;
ulong nclosed;
Lock l;
QLock q;
Rendez r;
@ -492,39 +492,6 @@ clunkwork(void*)
return clunkq.head != nil;
}
static void
closeproc(void*)
{
Chan *c;
for(;;){
if(clunkq.head == nil){
if(!waserror()){
tsleep(&clunkq.r, clunkwork, nil, 5000);
poperror();
}
}
qunlock(&clunkq.q);
lock(&clunkq.l);
c = clunkq.head;
if(c == nil){
unlock(&clunkq.l);
if(canqlock(&clunkq.q))
continue;
pexit("no work", 1);
}
clunkq.head = c->next;
clunkq.nclosed++;
unlock(&clunkq.l);
if(!waserror()){
devtab[c->type]->close(c);
poperror();
}
chanfree(c);
qlock(&clunkq.q);
}
}
static void
closechanq(Chan *c)
{
@ -537,17 +504,60 @@ closechanq(Chan *c)
clunkq.head = c;
clunkq.tail = c;
unlock(&clunkq.l);
wakeup(&clunkq.r);
}
if(up != 0 && palloc.Lock.p != up && canqlock(&clunkq.q)){
c = up->dot;
up->dot = up->slash; /* dummy */
static Chan*
closechandeq(void)
{
Chan *c;
lock(&clunkq.l);
c = clunkq.head;
if(c != nil) {
clunkq.head = c->next;
clunkq.nclosed++;
}
unlock(&clunkq.l);
return c;
}
static void
closeproc(void *)
{
Chan *c;
for(;;){
c = closechandeq();
if(c == nil) {
qlock(&clunkq.q);
if(!waserror()) {
tsleep(&clunkq.r, clunkwork, nil, 500);
poperror();
}
c = closechandeq();
if(c == nil) {
if(clunkq.q.head != nil) {
qunlock(&clunkq.q);
pexit("no work", 1);
}
qunlock(&clunkq.q);
continue;
}
if(clunkq.q.head == nil) {
if(!waserror()) {
kproc("closeproc", closeproc, nil);
poperror();
}
}
qunlock(&clunkq.q);
}
if(!waserror()){
kproc("closeproc", closeproc, nil);
devtab[c->type]->close(c);
poperror();
}
up->dot = c;
}else
wakeup(&clunkq.r);
chanfree(c);
}
}
void