r3520 - in trunk/varnish-cache/bin: varnishd varnishtest/tests
phk at projects.linpro.no
phk at projects.linpro.no
Sun Jan 18 17:43:47 CET 2009
Author: phk
Date: 2009-01-18 17:43:46 +0100 (Sun, 18 Jan 2009)
New Revision: 3520
Modified:
trunk/varnish-cache/bin/varnishd/cache_ban.c
trunk/varnish-cache/bin/varnishtest/tests/c00021.vtc
Log:
Set cost 10 on regexp tests.
Let purge.list prune the tail of the list before dumping.
Modified: trunk/varnish-cache/bin/varnishd/cache_ban.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ban.c 2009-01-18 16:25:54 UTC (rev 3519)
+++ trunk/varnish-cache/bin/varnishd/cache_ban.c 2009-01-18 16:43:46 UTC (rev 3520)
@@ -154,6 +154,8 @@
regfree(&bt->re);
if (bt->dst != NULL)
free(bt->dst);
+ if (bt->src != NULL)
+ free(bt->src);
FREE_OBJ(bt);
}
FREE_OBJ(b);
@@ -276,6 +278,7 @@
return (-1);
}
bt->flags |= BAN_T_REGEXP;
+ bt->cost = 10;
return (0);
}
@@ -429,6 +432,23 @@
Lck_Unlock(&ban_mtx);
}
+static struct ban *
+BAN_CheckLast(void)
+{
+ struct ban *b;
+
+ Lck_AssertHeld(&ban_mtx);
+ b = VTAILQ_LAST(&ban_head, banhead);
+ if (b != VTAILQ_FIRST(&ban_head) && b->refcount == 0) {
+ VSL_stats->n_purge--;
+ VSL_stats->n_purge_retire++;
+ VTAILQ_REMOVE(&ban_head, b, list);
+ } else {
+ b = NULL;
+ }
+ return (b);
+}
+
void
BAN_DestroyObj(struct object *o)
{
@@ -442,21 +462,15 @@
o->ban->refcount--;
o->ban = NULL;
- /* Check if we can purge the last ban entry */
- b = VTAILQ_LAST(&ban_head, banhead);
- if (b != VTAILQ_FIRST(&ban_head) && b->refcount == 0) {
- VSL_stats->n_purge--;
- VSL_stats->n_purge_retire++;
- VTAILQ_REMOVE(&ban_head, b, list);
- } else {
- b = NULL;
- }
+ /* Attempt to purge last ban entry */
+ b = BAN_CheckLast();
Lck_Unlock(&ban_mtx);
if (b != NULL)
ban_free_ban(b);
}
+
int
BAN_CheckObject(struct object *o, const struct sess *sp)
{
@@ -608,9 +622,16 @@
(void)av;
(void)priv;
- Lck_Lock(&ban_mtx);
- VTAILQ_LAST(&ban_head, banhead)->refcount++;
- Lck_Unlock(&ban_mtx);
+ do {
+ /* Attempt to purge last ban entry */
+ Lck_Lock(&ban_mtx);
+ b = BAN_CheckLast();
+ if (b == NULL)
+ VTAILQ_LAST(&ban_head, banhead)->refcount++;
+ Lck_Unlock(&ban_mtx);
+ if (b != NULL)
+ ban_free_ban(b);
+ } while (b != NULL);
VTAILQ_FOREACH(b, &ban_head, list) {
if (b->flags & BAN_F_GONE)
Modified: trunk/varnish-cache/bin/varnishtest/tests/c00021.vtc
===================================================================
--- trunk/varnish-cache/bin/varnishtest/tests/c00021.vtc 2009-01-18 16:25:54 UTC (rev 3519)
+++ trunk/varnish-cache/bin/varnishtest/tests/c00021.vtc 2009-01-18 16:43:46 UTC (rev 3520)
@@ -112,7 +112,7 @@
} -run
# header check, no header
-varnish v1 -cliok "purge obj.http.bar == barcheck"
+varnish v1 -cliok "purge req.url ~ foo && obj.http.bar == barcheck"
varnish v1 -cliok "purge.list"
client c1 {
More information about the varnish-commit
mailing list