Mailing List Archive

Author: phk
Date: 2006-09-07 09:17:31 +0200 (Thu, 07 Sep 2006)
New Revision: 940

Modified:
trunk/varnish-cache/bin/varnishd/storage_file.c
Log:
remove "age", it was effectively unused. Revisit the idea later.


Modified: trunk/varnish-cache/bin/varnishd/storage_file.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_file.c 2006-09-07 07:12:18 UTC (rev 939)
+++ trunk/varnish-cache/bin/varnishd/storage_file.c 2006-09-07 07:17:31 UTC (rev 940)
@@ -52,7 +52,6 @@
struct smf_sc *sc;

int alloc;
- time_t age;

off_t size;
off_t offset;
@@ -309,8 +308,7 @@
TAILQ_FOREACH(sp2, sp->flist, status) {
assert(sp2->alloc == 0);
assert(sp2->flist == sp->flist);
- if (sp->age > sp2->age ||
- (sp->age == sp2->age && sp->offset < sp2->offset)) {
+ if (sp->offset < sp2->offset) {
TAILQ_INSERT_BEFORE(sp2, sp, status);
break;
}
@@ -429,7 +427,6 @@
remfree(sc, sp2);
sp2->size += sp->size;
VSL(SLT_Debug, 0, "FILE CP %p -> %p %ju", sp, sp2, sp2->size);
- sp2->age = sp->age;
TAILQ_REMOVE(&sc->order, sp, order);
free(sp);
VSL_stats->n_smf--;