r3329 - in trunk/varnish-cache: bin/varnishd include

[phk at projects.linpro.no]

Author: phk
Date: 2008-10-20 17:01:37 +0200 (Mon, 20 Oct 2008)
New Revision: 3329

Modified:
   trunk/varnish-cache/bin/varnishd/cache_ban.c
   trunk/varnish-cache/bin/varnishd/heritage.h
   trunk/varnish-cache/bin/varnishd/mgt_param.c
   trunk/varnish-cache/include/stat_field.h
Log:
Add a boolean parameter "purge_dups", to make it possible to mark earlier
bans of the same regexp as "gone" to save duplicate regexp checking.

Prodded to by:	jodok



Modified: trunk/varnish-cache/bin/varnishd/cache_ban.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ban.c	2008-10-20 09:04:54 UTC (rev 3328)
+++ trunk/varnish-cache/bin/varnishd/cache_ban.c	2008-10-20 15:01:37 UTC (rev 3329)
@@ -49,6 +49,8 @@
 #define BAN_MAGIC		0x700b08ea
 	VTAILQ_ENTRY(ban)	list;
 	unsigned		refcount;
+	int			flags;
+#define BAN_F_GONE		(1 << 0)
 	regex_t			regexp;
 	char			*ban;
 	int			hash;
@@ -68,8 +70,9 @@
 int
 BAN_Add(struct cli *cli, const char *regexp, int hash)
 {
-	struct ban *b;
+	struct ban *b, *bi, *be;
 	char buf[512];
+	unsigned pcount;
 	int i;
 
 	ALLOC_OBJ(b, BAN_MAGIC);
@@ -97,8 +100,37 @@
 	ban_start = b;
 	VSL_stats->n_purge++;
 	VSL_stats->n_purge_add++;
+
+	if (params->purge_dups) {
+		be = VTAILQ_LAST(&ban_head, banhead);
+		be->refcount++;
+	} else
+		be = NULL;
 	UNLOCK(&ban_mtx);
 
+	if (be == NULL)
+		return (0);
+
+	/* Hunt down duplicates, and mark them as gone */
+	bi = b;
+	pcount = 0;
+	while(bi != be) {
+		bi = VTAILQ_NEXT(bi, list);
+		if (bi->flags & BAN_F_GONE)
+			continue;
+		if (b->hash != bi->hash)
+			continue;
+		if (strcmp(b->ban, bi->ban))
+			continue;
+		bi->flags |= BAN_F_GONE;
+		pcount++;
+	}
+	LOCK(&ban_mtx);
+	be->refcount--;
+	/* XXX: We should check if the tail can be removed */
+	VSL_stats->n_purge_dups += pcount;
+	UNLOCK(&ban_mtx);
+
 	return (0);
 }
 
@@ -168,7 +200,8 @@
 	tests = 0;
 	for (b = b0; b != o->ban; b = VTAILQ_NEXT(b, list)) {
 		tests++;
-		if (!regexec(&b->regexp, b->hash ? hash : url, 0, NULL, 0))
+		if (!(b->flags & BAN_F_GONE) &&
+		    !regexec(&b->regexp, b->hash ? hash : url, 0, NULL, 0))
 			break;
 	}
 
@@ -227,8 +260,8 @@
 	for (b0 = ban_start; b0 != NULL; b0 = VTAILQ_NEXT(b0, list)) {
 		if (b0->refcount == 0 && VTAILQ_NEXT(b0, list) == NULL)
 			break;
-		cli_out(cli, "%5u %s \"%s\"\n",
-		    b0->refcount,
+		cli_out(cli, "%5u %d %s \"%s\"\n",
+		    b0->refcount, b0->flags,
 		    b0->hash ? "hash" : "url ",
 		    b0->ban);
 	}

Modified: trunk/varnish-cache/bin/varnishd/heritage.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/heritage.h	2008-10-20 09:04:54 UTC (rev 3328)
+++ trunk/varnish-cache/bin/varnishd/heritage.h	2008-10-20 15:01:37 UTC (rev 3329)
@@ -183,6 +183,9 @@
 	/* Amount of time to sleep when running out of file
 	   descriptors.  In msecs */
 	unsigned		accept_fd_holdoff;
+
+	/* Get rid of duplicate purges */
+	unsigned		purge_dups;
 };
 
 extern volatile struct params *params;

Modified: trunk/varnish-cache/bin/varnishd/mgt_param.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_param.c	2008-10-20 09:04:54 UTC (rev 3328)
+++ trunk/varnish-cache/bin/varnishd/mgt_param.c	2008-10-20 15:01:37 UTC (rev 3329)
@@ -825,6 +825,10 @@
 		"The TTL assigned to the synthesized error pages\n",
 		0,
 		"0", "seconds" },
+	{ "purge_dups", tweak_bool, &master.purge_dups, 0, 0,
+		"Detect and eliminate duplicate purges.\n",
+		0,
+		"off", "bool" },
 	{ NULL, NULL, NULL }
 };
 

Modified: trunk/varnish-cache/include/stat_field.h
===================================================================
--- trunk/varnish-cache/include/stat_field.h	2008-10-20 09:04:54 UTC (rev 3328)
+++ trunk/varnish-cache/include/stat_field.h	2008-10-20 15:01:37 UTC (rev 3329)
@@ -125,3 +125,4 @@
 MAC_STAT(n_purge_retire,	uint64_t, 'a', "N old purges deleted")
 MAC_STAT(n_purge_obj_test,	uint64_t, 'a', "N objects tested")
 MAC_STAT(n_purge_re_test,	uint64_t, 'a', "N regexps tested against")
+MAC_STAT(n_purge_dups,		uint64_t, 'a', "N duplicate purges removed")