cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-24 11:41:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

9pfuse: fix memory leak, avoid memory explosion

Browse source 
Change is to handle FUSE_FORGET in main loop instead of separate thread for each as 10s of thousands can come in at once.
Fixes issue 104.

R=0intro, rsc
http://codereview.appspot.com/6498081
This commit is contained in:
Ties Bos 2012-09-10 22:07:26 -04:00 committed by Russ Cox
parent ba31102633
commit d4ccb0a943
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CONTRIBUTORS
View file

@ -35,6 +35,7 @@ Rob Kroeger <robkroeger@gmail.com>
Rob Pike <robpike@gmail.com> Rob Pike <robpike@gmail.com>
Russ Cox <rsc@swtch.com> Russ Cox <rsc@swtch.com>
Sean McKean <smckean83@gmail.com> Sean McKean <smckean83@gmail.com>
Ties Bos <gitbisector@gmail.com>
Tim Newsham <tim.newsham@gmail.com> Tim Newsham <tim.newsham@gmail.com>
Tony Lainson <t.lainson@gmail.com> Tony Lainson <t.lainson@gmail.com>
Venkatesh Srinivas <extrudedaluminiu@gmail.com> Venkatesh Srinivas <extrudedaluminiu@gmail.com>

13
src/cmd/9pfuse/main.c
View file

@ -257,6 +257,7 @@ allocfh(CFid *fid)
{ {
return _alloc(fid, 0); return _alloc(fid, 0);
} }
uvlong uvlong
allocnodeid(CFid *fid) allocnodeid(CFid *fid)
{ {
@ -412,6 +413,7 @@ fuseforget(FuseMsg *m)
fprint(2, "bad count in forget\n"); fprint(2, "bad count in forget\n");
ff->ref = 1; ff->ref = 1;
freefusefid(ff); freefusefid(ff);
freefusemsg(m);
} }
/* /*
@ -1255,8 +1257,15 @@ fusedispatch(void *v)
fusehandlers[fuselist[i].op] = fuselist[i].fn; fusehandlers[fuselist[i].op] = fuselist[i].fn;
} }
while((m = recvp(fusechan)) != nil) while((m = recvp(fusechan)) != nil) {
threadcreate(fusethread, m, STACK); switch(m->hdr->opcode) {
case FUSE_FORGET:
fusehandlers[m->hdr->opcode](m);
break;
default:
threadcreate(fusethread, m, STACK);
}
}
} }
void* void*