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

kbdfs: send interrupt note in separate proc to prevent potential deadlock

Browse source
This commit is contained in:
cinap_lenrek 2012-11-09 17:39:35 +01:00
parent 663aff7fb2
commit 0df3f94ecd
1 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
sys/src/cmd/aux/kbdfs/kbdfs.c
View file

@ -113,6 +113,7 @@ Channel *runechan; /* chan(Rune) */
Channel *conschan; /* chan(char*) */ Channel *conschan; /* chan(char*) */
Channel *kbdchan; /* chan(char*) */ Channel *kbdchan; /* chan(char*) */
Channel *intchan; /* chan(int) */
/* /*
* The codes at 0x79 and 0x7b are produced by the PFU Happy Hacking keyboard. * The codes at 0x79 and 0x7b are produced by the PFU Happy Hacking keyboard.
@ -543,6 +544,21 @@ Forward:
} }
} }
/*
* Need to do this in a separate proc because if process we're interrupting
* is dying and trying to print tombstone, kernel is blocked holding p->debug lock.
*/
void
intrproc(void *)
{
threadsetname("intrproc");
for(;;){
if(recv(intchan, nil) > 0)
write(notefd, "interrupt", 9);
}
}
/* /*
* Cook lines for cons * Cook lines for cons
*/ */
@ -565,9 +581,8 @@ lineproc(void *aux)
recv(cook, &r); recv(cook, &r);
switch(r){ switch(r){
case Kdel: case Kdel:
if(notefd < 0) if(nbsend(intchan, &notefd) <= 0)
continue; continue;
write(notefd, "interrupt", 9);
/* no break */ /* no break */
case '\0': /* flush */ case '\0': /* flush */
nr = 0; nr = 0;
@ -711,6 +726,8 @@ ctlproc(void *)
proccreate(scanproc, nil, STACK); /* scanfd -> keychan */ proccreate(scanproc, nil, STACK); /* scanfd -> keychan */
if(consfd >= 0) if(consfd >= 0)
proccreate(consproc, nil, STACK); /* consfd -> runechan */ proccreate(consproc, nil, STACK); /* consfd -> runechan */
if(notefd >= 0)
proccreate(intrproc, nil, STACK); /* intchan -> notefd */
threadcreate(keyproc, nil, STACK); /* keychan -> rawchan, kbdchan */ threadcreate(keyproc, nil, STACK); /* keychan -> rawchan, kbdchan */
threadcreate(runeproc, nil, STACK); /* rawchan -> runechan */ threadcreate(runeproc, nil, STACK); /* rawchan -> runechan */
@ -1382,6 +1399,7 @@ threadmain(int argc, char** argv)
runechan = chancreate(sizeof(Rune), 32); runechan = chancreate(sizeof(Rune), 32);
conschan = chancreate(sizeof(char*), 16); conschan = chancreate(sizeof(char*), 16);
kbdchan = chancreate(sizeof(char*), 16); kbdchan = chancreate(sizeof(char*), 16);
intchan = chancreate(sizeof(int), 0);
elevate(); elevate();
procrfork(ctlproc, nil, STACK, RFNAMEG|RFNOTEG); procrfork(ctlproc, nil, STACK, RFNAMEG|RFNOTEG);