r3791 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2009-02-20 12:05:14 +0100 (Fri, 20 Feb 2009)
New Revision: 3791

Modified:
   trunk/varnish-cache/bin/varnishd/cache_ban.c
   trunk/varnish-cache/bin/varnishd/cache_expire.c
   trunk/varnish-cache/bin/varnishd/cache_hash.c
   trunk/varnish-cache/bin/varnishd/hash_critbit.c
   trunk/varnish-cache/bin/varnishd/hash_slinger.h
Log:
Be more defensive around objhead retirement.



Modified: trunk/varnish-cache/bin/varnishd/cache_ban.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ban.c	2009-02-20 09:56:49 UTC (rev 3790)
+++ trunk/varnish-cache/bin/varnishd/cache_ban.c	2009-02-20 11:05:14 UTC (rev 3791)
@@ -469,6 +469,7 @@
 		return;
 	CHECK_OBJ_NOTNULL(o->ban, BAN_MAGIC);
 	Lck_Lock(&ban_mtx);
+	assert(o->ban->refcount > 0);
 	o->ban->refcount--;
 	o->ban = NULL;
 
@@ -477,7 +478,6 @@
 	Lck_Unlock(&ban_mtx);
 	if (b != NULL)
 		BAN_Free(b);
-
 }
 
 

Modified: trunk/varnish-cache/bin/varnishd/cache_expire.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_expire.c	2009-02-20 09:56:49 UTC (rev 3790)
+++ trunk/varnish-cache/bin/varnishd/cache_expire.c	2009-02-20 11:05:14 UTC (rev 3791)
@@ -272,6 +272,7 @@
 		    "%u %d", o->xid, (int)(o->ttl - t));
 		Lck_Lock(&exp_mtx);
 		assert(oc->timer_idx == BINHEAP_NOIDX);
+		assert(oc->flags & OC_F_ONLRU);
 		VTAILQ_REMOVE(&lru, o->objcore, lru_list);
 		oc->flags &= ~OC_F_ONLRU;
 		VSL_stats->n_expired++;

Modified: trunk/varnish-cache/bin/varnishd/cache_hash.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_hash.c	2009-02-20 09:56:49 UTC (rev 3790)
+++ trunk/varnish-cache/bin/varnishd/cache_hash.c	2009-02-20 11:05:14 UTC (rev 3791)
@@ -141,6 +141,18 @@
 }
 
 void
+HSH_DeleteObjHead(struct objhead *oh)
+{
+
+	AZ(oh->refcnt);
+	assert(VTAILQ_EMPTY(&oh->objcs));
+	Lck_Delete(&oh->mtx);
+	VSL_stats->n_objecthead--;
+	free(oh->hash);
+	FREE_OBJ(oh);
+}
+
+void
 HSH_Freestore(struct object *o)
 {
 	struct storage *st, *stn;
@@ -311,7 +323,7 @@
 		if (o->hits < INT_MAX)
 			o->hits++;
 		Lck_Unlock(&oh->mtx);
-		(void)hash->deref(oh);
+		assert(hash->deref(oh));
 		return (o);
 	}
 
@@ -476,6 +488,7 @@
 		return;
 
 	BAN_DestroyObj(o);
+	AZ(o->ban);
 	DSL(0x40, SLT_Debug, 0, "Object %u workspace min free %u",
 	    o->xid, WS_Free(o->ws_o));
 
@@ -494,13 +507,10 @@
 	AN(oc);
 	FREE_OBJ(oc);
 	/* Drop our ref on the objhead */
+	assert(oh->refcnt > 0);
 	if (hash->deref(oh))
 		return;
-	assert(VTAILQ_EMPTY(&oh->objcs));
-	Lck_Delete(&oh->mtx);
-	VSL_stats->n_objecthead--;
-	free(oh->hash);
-	FREE_OBJ(oh);
+	HSH_DeleteObjHead(oh);
 }
 
 void

Modified: trunk/varnish-cache/bin/varnishd/hash_critbit.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_critbit.c	2009-02-20 09:56:49 UTC (rev 3790)
+++ trunk/varnish-cache/bin/varnishd/hash_critbit.c	2009-02-20 11:05:14 UTC (rev 3791)
@@ -323,7 +323,7 @@
 
 /**********************************************************************/
 
-#define COOL_DURATION	15		/* seconds */
+#define COOL_DURATION	60		/* seconds */
 
 static void *
 hcb_cleaner(void *priv)
@@ -337,10 +337,6 @@
 		(void)sleep(1);
 		Lck_Lock(&hcb_mtx);
 		VTAILQ_FOREACH_SAFE(oh, &laylow, coollist, oh2) {
-			if (oh->hash != NULL) {
-				free(oh->hash);
-				oh->hash = NULL;
-			}
 			y = (void *)&oh->u;
 			if (y->leaf[0] || y->leaf[1])
 				continue;
@@ -349,8 +345,8 @@
 #ifdef PHK
 				fprintf(stderr, "OH %p is cold enough\n", oh);
 #endif
-				free(oh);
-				VSL_stats->n_objecthead--;
+				oh->refcnt = 0;
+				HSH_DeleteObjHead(oh);
 			}
 		}
 		Lck_Unlock(&hcb_mtx);
@@ -381,6 +377,7 @@
 	r = 1;
 	CHECK_OBJ_NOTNULL(oh, OBJHEAD_MAGIC);
 	Lck_Lock(&oh->mtx);
+	assert(oh->refcnt > 0);
 	if (--oh->refcnt == 0) {
 		Lck_Lock(&hcb_mtx);
 		hcb_delete(&hcb_root, oh);

Modified: trunk/varnish-cache/bin/varnishd/hash_slinger.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_slinger.h	2009-02-20 09:56:49 UTC (rev 3790)
+++ trunk/varnish-cache/bin/varnishd/hash_slinger.h	2009-02-20 11:05:14 UTC (rev 3791)
@@ -50,6 +50,7 @@
 
 /* cache_hash.c */
 void HSH_Prealloc(struct sess *sp);
+void HSH_DeleteObjHead(struct objhead *oh);
 void HSH_Freestore(struct object *o);
 void HSH_Copy(const struct sess *sp, struct objhead *o);
 struct object *HSH_Lookup(struct sess *sp);