]> err.no Git - varnish/commitdiff
remove "age", it was effectively unused. Revisit the idea later.
authorphk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Thu, 7 Sep 2006 07:17:31 +0000 (07:17 +0000)
committerphk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Thu, 7 Sep 2006 07:17:31 +0000 (07:17 +0000)
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@940 d4fa192b-c00b-0410-8231-f00ffab90ce4

varnish-cache/bin/varnishd/storage_file.c

index 354d388d037ebb5c83591e613b9d0da2edf897ab..c85dea1252a722c083e05d7fd2292ea489f71085 100644 (file)
@@ -52,7 +52,6 @@ struct smf {
        struct smf_sc           *sc;
 
        int                     alloc;
-       time_t                  age;
 
        off_t                   size;
        off_t                   offset;
@@ -309,8 +308,7 @@ insfree(struct smf_sc *sc, struct smf *sp)
        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 @@ free_smf(struct smf *sp)
                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--;