r5186 - trunk/varnish-cache/bin/varnishd

[phk at varnish-cache.org]

Author: phk
Date: 2010-09-08 12:04:17 +0200 (Wed, 08 Sep 2010)
New Revision: 5186

Modified:
   trunk/varnish-cache/bin/varnishd/cache_expire.c
Log:
The expire thread don't actuall need a VCL reference any more.



Modified: trunk/varnish-cache/bin/varnishd/cache_expire.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_expire.c	2010-09-08 10:01:05 UTC (rev 5185)
+++ trunk/varnish-cache/bin/varnishd/cache_expire.c	2010-09-08 10:04:17 UTC (rev 5186)
@@ -50,7 +50,6 @@
 
 #include "binary_heap.h"
 #include "cache.h"
-#include "vcl.h"
 #include "hash_slinger.h"
 #include "stevedore.h"
 
@@ -155,8 +154,7 @@
  *
  * 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.
- * This optimization obviously leaves the LRU list imperfectly sorted, but
- * that can be worked around by examining obj.last_use in vcl_discard{}
+ * This optimization obviously leaves the LRU list imperfectly sorted.
  */
 
 int
@@ -258,7 +256,6 @@
 	double t;
 
 	(void)priv;
-	VCL_Get(&sp->vcl);
 	t = TIM_real();
 	while (1) {
 		Lck_Lock(&exp_mtx);
@@ -269,7 +266,6 @@
 			WSL_Flush(sp->wrk, 0);
 			WRK_SumStat(sp->wrk);
 			AZ(sleep(1));
-			VCL_Refresh(&sp->vcl);
 			t = TIM_real();
 			continue;
 		}