Skip to content

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

Divorce the OFFLRU flag from the EXP flags

parent f2882d3c
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 17 deletions
bin/varnishd/cache/cache.h
View file @ f267941f
......@@ -429,7 +429,6 @@ struct objcore {
#define OC_F_FAILED (1<<6)
uint8_t exp_flags;
#define OC_EF_OFFLRU (1<<1)
#define OC_EF_MOVE (1<<2)
#define OC_EF_INSERT (1<<3)
#define OC_EF_EXP (1<<4)
......@@ -437,10 +436,12 @@ struct objcore {
uint16_t oa_present;
unsigned timer_idx;
unsigned timer_idx; // XXX 4Gobj limit
VTAILQ_ENTRY(objcore) list;
VTAILQ_ENTRY(objcore) lru_list;
double last_lru;
float last_lru;
unsigned lru_flags;
#define OC_LRU_OFFLRU (1<<1)
VTAILQ_ENTRY(objcore) ban_list;
struct ban *ban;
};
......
bin/varnishd/cache/cache_expire.c
View file @ f267941f
......@@ -141,7 +141,7 @@ exp_mail_it(struct objcore *oc)
{
CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
AN(oc->exp_flags & OC_EF_OFFLRU);
AN(oc->lru_flags & OC_LRU_OFFLRU);
Lck_Lock(&exphdl->mtx);
if (oc->exp_flags & OC_EF_DYING)
VTAILQ_INSERT_HEAD(&exphdl->inbox, oc, lru_list);
......@@ -166,14 +166,16 @@ EXP_Inject(struct worker *wrk, struct objcore *oc, struct lru *lru)
CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
AZ(oc->exp_flags & (OC_EF_OFFLRU | OC_EF_INSERT | OC_EF_MOVE));
AZ(oc->lru_flags & OC_LRU_OFFLRU);
AZ(oc->exp_flags & (OC_EF_INSERT | OC_EF_MOVE));
AZ(oc->exp_flags & OC_EF_DYING);
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;
oc->lru_flags |= OC_LRU_OFFLRU;
oc->exp_flags |= OC_EF_INSERT | OC_EF_EXP;
oc->timer_when = EXP_When(&oc->exp);
Lck_Unlock(&lru->mtx);
......@@ -198,7 +200,8 @@ EXP_Insert(struct worker *wrk, struct objcore *oc)
CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
HSH_Ref(oc);
AZ(oc->exp_flags & (OC_EF_OFFLRU | OC_EF_INSERT | OC_EF_MOVE));
AZ(oc->lru_flags & OC_LRU_OFFLRU);
AZ(oc->exp_flags & (OC_EF_INSERT | OC_EF_MOVE));
AZ(oc->exp_flags & OC_EF_DYING);
AN(oc->flags & OC_F_BUSY);
......@@ -207,7 +210,8 @@ EXP_Insert(struct worker *wrk, struct objcore *oc)
Lck_Lock(&lru->mtx);
lru->n_objcore++;
oc->exp_flags |= OC_EF_OFFLRU | OC_EF_INSERT | OC_EF_EXP;
oc->lru_flags |= OC_LRU_OFFLRU;
oc->exp_flags |= OC_EF_INSERT | OC_EF_EXP;
oc->exp_flags |= OC_EF_MOVE;
Lck_Unlock(&lru->mtx);
......@@ -257,10 +261,10 @@ EXP_Rearm(struct objcore *oc, double now, double ttl, double grace, double keep)
else
oc->exp_flags |= OC_EF_MOVE;
if (oc->exp_flags & OC_EF_OFFLRU) {
if (oc->lru_flags & OC_LRU_OFFLRU) {
oc = NULL;
} else {
oc->exp_flags |= OC_EF_OFFLRU;
oc->lru_flags |= OC_LRU_OFFLRU;
VTAILQ_REMOVE(&lru->lru_head, oc, lru_list);
}
Lck_Unlock(&lru->mtx);
......@@ -290,7 +294,7 @@ EXP_NukeOne(struct worker *wrk, struct lru *lru)
VSLb(wrk->vsl, SLT_ExpKill, "LRU_Cand p=%p f=0x%x r=%d",
oc, oc->flags, oc->refcnt);
AZ(oc->exp_flags & OC_EF_OFFLRU);
AZ(oc->lru_flags & OC_LRU_OFFLRU);
if (ObjKill(wrk, oc)) {
VSC_C_main->n_lru_nuked++; // XXX per lru ?
......@@ -376,12 +380,12 @@ exp_inbox(struct exp_priv *ep, struct objcore *oc, double now)
/* Evacuate our action-flags, and put it back on the LRU list */
Lck_Lock(&lru->mtx);
flags = oc->exp_flags;
AN(flags & OC_EF_OFFLRU);
AN(oc->lru_flags & OC_LRU_OFFLRU);
oc->exp_flags &= ~(OC_EF_INSERT | OC_EF_MOVE);
oc->last_lru = now;
if (!(flags & OC_EF_DYING)) {
VTAILQ_INSERT_TAIL(&lru->lru_head, oc, lru_list);
oc->exp_flags &= ~OC_EF_OFFLRU;
oc->lru_flags &= ~OC_LRU_OFFLRU;
}
Lck_Unlock(&lru->mtx);
......@@ -454,10 +458,10 @@ exp_expire(struct exp_priv *ep, double now)
Lck_Lock(&lru->mtx);
oc->exp_flags |= OC_EF_DYING;
if (oc->exp_flags & OC_EF_OFFLRU)
if (oc->lru_flags & OC_LRU_OFFLRU)
oc = NULL;
else {
oc->exp_flags |= OC_EF_OFFLRU;
oc->lru_flags |= OC_LRU_OFFLRU;
VTAILQ_REMOVE(&lru->lru_head, oc, lru_list);
}
Lck_Unlock(&lru->mtx);
......
bin/varnishd/cache/cache_obj.c
View file @ f267941f
......@@ -389,7 +389,7 @@ ObjKill(const struct worker *wrk, struct objcore *oc)
if (oc->refcnt == 1 && !Lck_Trylock(&oc->objhead->mtx)) {
if (oc->refcnt == 1) {
oc->exp_flags |= OC_EF_DYING;
oc->exp_flags |= OC_EF_OFFLRU; /* XXX */
oc->lru_flags |= OC_LRU_OFFLRU; /* XXX */
oc->refcnt++;
retval = 1;
}
......
bin/varnishd/storage/storage_simple.c
View file @ f267941f
......@@ -635,7 +635,7 @@ sml_touch(struct worker *wrk, struct objcore *oc, double now)
AN(oc->exp_flags & OC_EF_EXP);
if (!(oc->exp_flags & OC_EF_OFFLRU)) {
if (!(oc->lru_flags & OC_LRU_OFFLRU)) {
/* Can only touch it while it's actually on the LRU list */
VTAILQ_REMOVE(&lru->lru_head, oc, lru_list);
VTAILQ_INSERT_TAIL(&lru->lru_head, oc, lru_list);
......
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