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

nusb/usbd: fix /env/usbbusy bug

Browse source 
run the usb hub poll "work()" proc in the same filedescriptor
group as the fileserver by forking the process in Srv.start
callback.

this also prevents the usbbusy filedescriptor from being kept
open by the fileserver process.
This commit is contained in:
cinap_lenrek 2020-03-07 22:26:49 +01:00
parent 1a1b4b54b3
commit efd64da989
3 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/cmd/nusb/usbd/dat.h
View file

@ -122,3 +122,5 @@ struct DSSHub
uchar wHubDelay[2];
uchar DeviceRemovable[1]; /* variable length */
};
extern Hub *hubs;

13
sys/src/cmd/nusb/usbd/hub.c
View file

@ -670,22 +670,9 @@ dump(void)
void
work(void)
{
char *fn;
Hub *h;
int i;
hubs = nil;
while((fn = rendezvous(work, nil)) != nil){
dprint(2, "%s: %s starting\n", argv0, fn);
h = newhub(fn, nil);
if(h == nil)
fprint(2, "%s: %s: newhub failed: %r\n", argv0, fn);
free(fn);
}
if(hubs == nil)
return;
/*
* Enumerate (and acknowledge after first enumeration).
* Do NOT perform enumeration concurrently for the same

46
sys/src/cmd/nusb/usbd/usbd.c
View file

@ -329,7 +329,17 @@ usbdflush(Req *req)
respond(req, nil);
}
static void
usbdstart(Srv*)
{
switch(rfork(RFPROC|RFMEM|RFNOWAIT)){
case -1: sysfatal("rfork: %r");
case 0: work(); exits(nil);
}
}
Srv usbdsrv = {
.start = usbdstart,
.attach = usbdattach,
.walk1 = usbdwalk,
.read = usbdread,
@ -447,6 +457,7 @@ void
main(int argc, char **argv)
{
int fd, i, nd;
char *fn;
Dir *d;
ARGBEGIN {
@ -458,34 +469,33 @@ main(int argc, char **argv)
break;
} ARGEND;
busyfd = create("/env/usbbusy", ORCLOSE, 0600);
quotefmtinstall();
fmtinstall('U', Ufmt);
initevent();
rfork(RFNOTEG);
switch(rfork(RFPROC|RFMEM|RFNOWAIT)){
case -1: sysfatal("rfork: %r");
case 0: work(); exits(nil);
}
hubs = nil;
if(argc == 0){
if((fd = open("/dev/usb", OREAD)) < 0){
rendezvous(work, nil);
if((fd = open("/dev/usb", OREAD)) < 0)
sysfatal("/dev/usb: %r");
}
nd = dirreadall(fd, &d);
close(fd);
if(nd < 2){
rendezvous(work, nil);
sysfatal("/dev/usb: no hubs");
for(i = 0; i < nd; i++){
if(strcmp(d[i].name, "ctl") != 0){
fn = smprint("/dev/usb/%s", d[i].name);
newhub(fn, nil);
free(fn);
}
}
for(i = 0; i < nd; i++)
if(strcmp(d[i].name, "ctl") != 0)
rendezvous(work, smprint("/dev/usb/%s", d[i].name));
free(d);
}else
}else {
for(i = 0; i < argc; i++)
rendezvous(work, estrdup9p(argv[i]));
rendezvous(work, nil);
newhub(argv[i], nil);
}
if(hubs == nil)
sysfatal("no hubs");
busyfd = create("/env/usbbusy", ORCLOSE, 0600);
postsharesrv(&usbdsrv, nil, "usb", "usbd");
exits(nil);
}