r3783 - trunk/varnish-cache/bin/varnishd
phk at projects.linpro.no
phk at projects.linpro.no
Tue Feb 17 12:11:58 CET 2009
Author: phk
Date: 2009-02-17 12:11:57 +0100 (Tue, 17 Feb 2009)
New Revision: 3783
Modified:
trunk/varnish-cache/bin/varnishd/cache.h
trunk/varnish-cache/bin/varnishd/cache_ban.c
trunk/varnish-cache/bin/varnishd/cache_center.c
trunk/varnish-cache/bin/varnishd/cache_expire.c
trunk/varnish-cache/bin/varnishd/cache_hash.c
trunk/varnish-cache/bin/varnishd/cache_vrt.c
trunk/varnish-cache/bin/varnishd/rfc2616.c
Log:
with the prefetch timer out of the way, we do not need the ttl
in objcore, only when the timer fires.
Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h 2009-02-17 10:50:42 UTC (rev 3782)
+++ trunk/varnish-cache/bin/varnishd/cache.h 2009-02-17 11:11:57 UTC (rev 3783)
@@ -262,7 +262,6 @@
#define OBJCORE_MAGIC 0x4d301302
struct object *obj;
double timer_when;
- double ttl;
unsigned char flags;
#define OC_F_ONLRU (1<<0)
#define OC_F_BUSY (1<<1)
@@ -294,6 +293,7 @@
unsigned len;
+ double ttl;
double age;
double entered;
double grace;
Modified: trunk/varnish-cache/bin/varnishd/cache_ban.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ban.c 2009-02-17 10:50:42 UTC (rev 3782)
+++ trunk/varnish-cache/bin/varnishd/cache_ban.c 2009-02-17 11:11:57 UTC (rev 3783)
@@ -528,7 +528,7 @@
o->ban = b0;
return (0);
} else {
- o->objcore->ttl = 0;
+ o->ttl = 0;
WSP(sp, SLT_ExpBan, "%u was banned", o->xid);
EXP_Rearm(o);
o->ban = NULL;
Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c 2009-02-17 10:50:42 UTC (rev 3782)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c 2009-02-17 11:11:57 UTC (rev 3783)
@@ -378,7 +378,6 @@
cnt_fetch(struct sess *sp)
{
int i;
- struct objcore *oc;
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
CHECK_OBJ_NOTNULL(sp->vcl, VCL_CONF_MAGIC);
@@ -415,12 +414,10 @@
sp->step = STP_RECV;
return (0);
case VCL_RET_PASS:
- if (sp->obj->objcore != NULL) {
- oc = sp->obj->objcore;
- oc->flags |= OC_F_PASS;
- if (oc->ttl - sp->t_req < params->default_ttl)
- oc->ttl = sp->t_req + params->default_ttl;
- }
+ if (sp->obj->objcore != NULL)
+ sp->obj->objcore->flags |= OC_F_PASS;
+ if (sp->obj->ttl - sp->t_req < params->default_ttl)
+ sp->obj->ttl = sp->t_req + params->default_ttl;
break;
case VCL_RET_DELIVER:
break;
Modified: trunk/varnish-cache/bin/varnishd/cache_expire.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_expire.c 2009-02-17 10:50:42 UTC (rev 3782)
+++ trunk/varnish-cache/bin/varnishd/cache_expire.c 2009-02-17 11:11:57 UTC (rev 3783)
@@ -90,7 +90,7 @@
CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
Lck_AssertHeld(&exp_mtx);
- when = oc->ttl + HSH_Grace(o->grace);
+ when = o->ttl + HSH_Grace(o->grace);
assert(!isnan(when));
if (when == oc->timer_when)
return (0);
@@ -269,7 +269,7 @@
assert(sp->handling == VCL_RET_DISCARD);
WSL(&ww, SLT_ExpKill, 0,
- "%u %d", o->xid, (int)(o->objcore->ttl - t));
+ "%u %d", o->xid, (int)(o->ttl - t));
Lck_Lock(&exp_mtx);
assert(oc->timer_idx == BINHEAP_NOIDX);
VTAILQ_REMOVE(&lru, o->objcore, lru_list);
Modified: trunk/varnish-cache/bin/varnishd/cache_hash.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_hash.c 2009-02-17 10:50:42 UTC (rev 3782)
+++ trunk/varnish-cache/bin/varnishd/cache_hash.c 2009-02-17 11:11:57 UTC (rev 3783)
@@ -276,7 +276,7 @@
}
if (!o->cacheable)
continue;
- if (oc->ttl == 0)
+ if (o->ttl == 0)
continue;
if (BAN_CheckObject(o, sp))
continue;
@@ -284,11 +284,11 @@
continue;
/* If still valid, use it */
- if (oc->ttl >= sp->t_req)
+ if (o->ttl >= sp->t_req)
break;
/* Remember any matching objects inside their grace period */
- if (oc->ttl + HSH_Grace(o->grace) >= sp->t_req)
+ if (o->ttl + HSH_Grace(o->grace) >= sp->t_req)
grace_o = o;
}
if (oc == NULL)
@@ -302,7 +302,7 @@
*/
if (o == NULL && grace_o != NULL &&
grace_o->child != NULL &&
- grace_o->objcore->ttl + HSH_Grace(sp->grace) >= sp->t_req)
+ grace_o->ttl + HSH_Grace(sp->grace) >= sp->t_req)
o = grace_o;
if (o != NULL) {
@@ -381,7 +381,7 @@
assert(o->refcnt > 0);
if (o->objcore != NULL) { /* Pass has no objcore */
AN(ObjIsBusy(o));
- o->objcore->ttl = 0;
+ o->ttl = 0;
}
o->cacheable = 0;
if (o->objcore != NULL) /* Pass has no objcore */
Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c 2009-02-17 10:50:42 UTC (rev 3782)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c 2009-02-17 11:11:57 UTC (rev 3783)
@@ -380,9 +380,9 @@
* We special case and make sure that rounding does not surprise.
*/
if (a <= 0)
- sp->obj->objcore->ttl = sp->t_req - 1;
+ sp->obj->ttl = sp->t_req - 1;
else
- sp->obj->objcore->ttl = sp->t_req + a;
+ sp->obj->ttl = sp->t_req + a;
EXP_Rearm(sp->obj);
}
@@ -393,7 +393,7 @@
CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC); /* XXX */
if (sp->obj->objcore == NULL)
return (0.0);
- return (sp->obj->objcore->ttl - sp->t_req);
+ return (sp->obj->ttl - sp->t_req);
}
/*--------------------------------------------------------------------
Modified: trunk/varnish-cache/bin/varnishd/rfc2616.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/rfc2616.c 2009-02-17 10:50:42 UTC (rev 3782)
+++ trunk/varnish-cache/bin/varnishd/rfc2616.c 2009-02-17 11:11:57 UTC (rev 3783)
@@ -198,8 +198,7 @@
}
ttl = RFC2616_Ttl(sp, hp, sp->obj);
- if (sp->obj->objcore != NULL)
- sp->obj->objcore->ttl = ttl;
+ sp->obj->ttl = ttl;
if (ttl == 0)
sp->obj->cacheable = 0;
More information about the varnish-commit
mailing list