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

httpfile: fix evictblock() so we wont consume all the memory

Browse source
This commit is contained in:
cinap_lenrek 2015-07-13 05:51:04 +02:00
parent 39c9f1abbb
commit 41372f346a
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/src/cmd/ip/httpfile.c
View file

@ -114,11 +114,11 @@ evictblock(Blocklist *cache)
for(l=&cache->first; (b=*l) != nil; l=&b->link){
if(b->rq != nil) /* dont touch block when still requests queued */
continue;
if(b->rq != nil && (oldest == nil || (*oldest)->lastuse > b->lastuse))
if(oldest == nil || (*oldest)->lastuse > b->lastuse)
oldest = l;
}
if(oldest == nil)
if(oldest == nil || *oldest == nil || (*oldest)->rq != nil)
return;
b = *oldest;
@ -439,8 +439,7 @@ finishthread(void*)
b = recvp(finishchan);
assert(b == inprogress.first);
inprogress.first = b->link;
ncache++;
if(ncache >= mcache)
if(++ncache >= mcache)
evictblock(&cache);
addblock(&cache, b);
while((r = b->rq) != nil){
@ -448,7 +447,7 @@ finishthread(void*)
r->aux = nil;
readfrom(r, b);
}
if(inprogress.first)
if(inprogress.first != nil)
sendp(httpchan, inprogress.first);
}
}