r4973 - trunk/varnish-cache/bin/varnishd

[phk at varnish-cache.org]

Author: phk
Date: 2010-06-21 09:48:01 +0200 (Mon, 21 Jun 2010)
New Revision: 4973

Modified:
   trunk/varnish-cache/bin/varnishd/cache_esi.c
Log:
Use WSP instead of VSL for ordering and performance



Modified: trunk/varnish-cache/bin/varnishd/cache_esi.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_esi.c	2010-06-19 16:51:43 UTC (rev 4972)
+++ trunk/varnish-cache/bin/varnishd/cache_esi.c	2010-06-21 07:48:01 UTC (rev 4973)
@@ -262,7 +262,7 @@
 			ew->eb->verbatim.e = TRUST_ME(verbatim + len);
 		sprintf(ew->eb->chunk_length, "%x\r\n", Tlen(ew->eb->verbatim));
 		if (params->esi_syntax & 0x4)
-			VSL(SLT_Debug, ew->sp->fd, "AddBit: %d <%.*s>",
+			WSP(ew->sp, SLT_Debug, "AddBit: %d <%.*s>",
 			    Tlen(ew->eb->verbatim),
 			    Tlen(ew->eb->verbatim),
 			    ew->eb->verbatim.b);
@@ -399,10 +399,10 @@
 	if (ew->eb == NULL || ew->eb->include.b != NULL)
 		esi_addbit(ew, NULL, 0);
 	eb = ew->eb;
-	VSL(SLT_Debug, ew->sp->fd, "Incl \"%.*s\"", t.e - t.b, t.b);
+	WSP(ew->sp, SLT_Debug, "Incl \"%.*s\"", t.e - t.b, t.b);
 	while (esi_attrib(ew, &t, &tag, &val) == 1) {
 		if (params->esi_syntax & 0x4)
-			VSL(SLT_Debug, ew->sp->fd, "<%.*s> -> <%.*s>",
+			WSP(ew->sp, SLT_Debug, "<%.*s> -> <%.*s>",
 			    tag.e - tag.b, tag.b, val.e - val.b, val.b);
 		if (Tlen(tag) != 3 || memcmp(tag.b, "src", 3))
 			continue;
@@ -650,7 +650,7 @@
 
 	ew->tag.b += 4 + (closing ? 1 : 0);
 	l = Tlen(ew->tag);
-	VSL(SLT_Debug, ew->sp->fd,
+	WSP(ew->sp, SLT_Debug,
 	    "tag {%.*s} %d %d %d", l, ew->tag.b, ew->remflg, empty, closing);
 	if (l >= 6 && !memcmp(ew->tag.b, "remove", 6)) {
 		if (empty) {