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

lib9p: make reqqueueflush() use new threadint(), which will also cover channel operations

Browse source 
using "interrupt" ctl message directly doesnt work when the
process is doing libthread channel operations (threadrendezvous)
as it will just repeat a interrupted rendezvous(). threadint()
handles this for us.
This commit is contained in:
cinap_lenrek 2015-08-10 03:52:40 +02:00
parent c235046310
commit 4b926f4e69
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sys/src/lib9p/queue.c
View file

@ -12,10 +12,10 @@ _reqqueueproc(void *v)
void (*f)(Req *);
int fd;
char *buf;
q = v;
rfork(RFNOTEG);
buf = smprint("/proc/%d/ctl", getpid());
fd = open(buf, OWRITE);
free(buf);
@ -48,7 +48,7 @@ reqqueuecreate(void)
memset(q, 0, sizeof(*q));
q->l = q;
q->next = q->prev = q;
q->pid = threadpid(proccreate(_reqqueueproc, q, mainstacksize));
q->pid = proccreate(_reqqueueproc, q, mainstacksize);
return q;
}
@ -68,17 +68,9 @@ reqqueuepush(Reqqueue *q, Req *r, void (*f)(Req *))
void
reqqueueflush(Reqqueue *q, Req *r)
{
char buf[128];
int fd;
qlock(q);
if(q->cur == r){
sprint(buf, "/proc/%d/ctl", q->pid);
fd = open(buf, OWRITE);
if(fd >= 0){
write(fd, "interrupt", 9);
close(fd);
}
threadint(q->pid);
q->flush++;
qunlock(q);
}else{