Commit e51990a2 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

The expire thread don't actuall need a VCL reference any more.



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5186 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent a18e43e8
...@@ -50,7 +50,6 @@ SVNID("$Id$") ...@@ -50,7 +50,6 @@ SVNID("$Id$")
#include "binary_heap.h" #include "binary_heap.h"
#include "cache.h" #include "cache.h"
#include "vcl.h"
#include "hash_slinger.h" #include "hash_slinger.h"
#include "stevedore.h" #include "stevedore.h"
...@@ -155,8 +154,7 @@ EXP_Insert(struct object *o) ...@@ -155,8 +154,7 @@ EXP_Insert(struct object *o)
* *
* To avoid the exp_mtx becoming a hotspot, we only attempt to move * To avoid the exp_mtx becoming a hotspot, we only attempt to move
* objects if they have not been moved recently and if the lock is available. * objects if they have not been moved recently and if the lock is available.
* This optimization obviously leaves the LRU list imperfectly sorted, but * This optimization obviously leaves the LRU list imperfectly sorted.
* that can be worked around by examining obj.last_use in vcl_discard{}
*/ */
int int
...@@ -258,7 +256,6 @@ exp_timer(struct sess *sp, void *priv) ...@@ -258,7 +256,6 @@ exp_timer(struct sess *sp, void *priv)
double t; double t;
(void)priv; (void)priv;
VCL_Get(&sp->vcl);
t = TIM_real(); t = TIM_real();
while (1) { while (1) {
Lck_Lock(&exp_mtx); Lck_Lock(&exp_mtx);
...@@ -269,7 +266,6 @@ exp_timer(struct sess *sp, void *priv) ...@@ -269,7 +266,6 @@ exp_timer(struct sess *sp, void *priv)
WSL_Flush(sp->wrk, 0); WSL_Flush(sp->wrk, 0);
WRK_SumStat(sp->wrk); WRK_SumStat(sp->wrk);
AZ(sleep(1)); AZ(sleep(1));
VCL_Refresh(&sp->vcl);
t = TIM_real(); t = TIM_real();
continue; continue;
} }
......
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