Skip to content

V
varnish-cache
Commit 1a750f28 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Divorce EXP_Inject() and EXP_Insert() -- they're quite different.

parent e654cc8a
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 9 deletions
bin/varnishd/cache/cache_expire.c
View file @ 1a750f28
......@@ -137,19 +137,13 @@ EXP_Inject(struct objcore *oc, struct lru *lru, double when)
AZ(oc->exp_flags & (OC_EF_OFFLRU | OC_EF_INSERT | OC_EF_MOVE));
AZ(oc->exp_flags & OC_EF_DYING);
// AN(oc->flags & OC_F_BUSY);
if (lru == NULL)
lru = oc_getlru(oc);
AZ(oc->flags & OC_F_BUSY);
CHECK_OBJ_NOTNULL(lru, LRU_MAGIC);
Lck_Lock(&lru->mtx);
lru->n_objcore++;
oc->exp_flags |= OC_EF_OFFLRU | OC_EF_INSERT | OC_EF_EXP;
if (when < 0)
oc->exp_flags |= OC_EF_MOVE;
else
oc->timer_when = when;
oc->timer_when = when;
Lck_Unlock(&lru->mtx);
exp_mail_it(oc);
......@@ -165,10 +159,25 @@ EXP_Inject(struct objcore *oc, struct lru *lru, double when)
void
EXP_Insert(struct objcore *oc)
{
struct lru *lru;
CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
HSH_Ref(oc);
EXP_Inject(oc, NULL, -1);
AZ(oc->exp_flags & (OC_EF_OFFLRU | OC_EF_INSERT | OC_EF_MOVE));
AZ(oc->exp_flags & OC_EF_DYING);
AN(oc->flags & OC_F_BUSY);
lru = oc_getlru(oc);
CHECK_OBJ_NOTNULL(lru, LRU_MAGIC);
Lck_Lock(&lru->mtx);
lru->n_objcore++;
oc->exp_flags |= OC_EF_OFFLRU | OC_EF_INSERT | OC_EF_EXP;
oc->exp_flags |= OC_EF_MOVE;
Lck_Unlock(&lru->mtx);
exp_mail_it(oc);
}
/*--------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment