r2069 - in trunk/varnish-cache: bin/varnishd include lib/libvcl

[phk at projects.linpro.no]

Author: phk
Date: 2007-09-30 23:27:16 +0200 (Sun, 30 Sep 2007)
New Revision: 2069

Added:
   trunk/varnish-cache/bin/varnishd/cache_vrt_esi.c
Modified:
   trunk/varnish-cache/bin/varnishd/Makefile.am
   trunk/varnish-cache/include/vrt.h
   trunk/varnish-cache/lib/libvcl/vcc_action.c
   trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
Log:
Add VCL action "esi" and a vrt file to contain it.


Modified: trunk/varnish-cache/bin/varnishd/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishd/Makefile.am	2007-09-30 21:11:21 UTC (rev 2068)
+++ trunk/varnish-cache/bin/varnishd/Makefile.am	2007-09-30 21:27:16 UTC (rev 2069)
@@ -34,6 +34,7 @@
 	cache_vrt.c \
 	cache_vrt_acl.c \
 	cache_vrt_re.c \
+	cache_vrt_esi.c \
 	cache_ws.c \
 	hash_simple_list.c \
 	hash_classic.c \

Added: trunk/varnish-cache/bin/varnishd/cache_vrt_esi.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt_esi.c	                        (rev 0)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt_esi.c	2007-09-30 21:27:16 UTC (rev 2069)
@@ -0,0 +1,52 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2007 Linpro AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id: cache_vrt.c 2067 2007-09-30 20:57:30Z phk $
+ *
+ * Runtime support for compiled VCL programs
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+
+#include "shmlog.h"
+#include "vrt.h"
+#include "vcl.h"
+#include "cache.h"
+
+/*--------------------------------------------------------------------*/
+
+void
+VRT_ESI(struct sess *sp)
+{
+
+	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+	INCOMPL();
+}

Modified: trunk/varnish-cache/include/vrt.h
===================================================================
--- trunk/varnish-cache/include/vrt.h	2007-09-30 21:11:21 UTC (rev 2068)
+++ trunk/varnish-cache/include/vrt.h	2007-09-30 21:27:16 UTC (rev 2069)
@@ -113,7 +113,9 @@
 /* Simple stuff */
 int VRT_strcmp(const char *s1, const char *s2);
 
+void VRT_ESI(struct sess *sp);
 
+
 /* Backend related */
 void VRT_init_simple_backend(struct backend **, const struct vrt_simple_backend *);
 void VRT_init_round_robin_backend(struct backend **, const struct vrt_round_robin_backend *);

Modified: trunk/varnish-cache/lib/libvcl/vcc_action.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_action.c	2007-09-30 21:11:21 UTC (rev 2068)
+++ trunk/varnish-cache/lib/libvcl/vcc_action.c	2007-09-30 21:27:16 UTC (rev 2069)
@@ -317,7 +317,16 @@
 	Fb(tl, 0, ", 1);\n");
 }
 
+static void
+parse_esi(struct tokenlist *tl)
+{
 
+	vcc_NextToken(tl);
+	Fb(tl, 1, "VRT_ESI(sp);\n");
+	Expect(tl, ';');
+	vcc_NextToken(tl);
+}
+
 /*--------------------------------------------------------------------*/
 
 typedef void action_f(struct tokenlist *tl);
@@ -336,6 +345,7 @@
 	{ "remove", 	parse_remove },
 	{ "purge_url",	parse_purge_url },
 	{ "purge_hash",	parse_purge_hash },
+	{ "esi",	parse_esi },
 
 	{ NULL,		NULL }
 };

Modified: trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c	2007-09-30 21:11:21 UTC (rev 2068)
+++ trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c	2007-09-30 21:27:16 UTC (rev 2069)
@@ -492,7 +492,9 @@
 	vsb_cat(sb, "/* Simple stuff */\n");
 	vsb_cat(sb, "int VRT_strcmp(const char *s1, const char *s2);\n");
 	vsb_cat(sb, "\n");
+	vsb_cat(sb, "void VRT_ESI(struct sess *sp);\n");
 	vsb_cat(sb, "\n");
+	vsb_cat(sb, "\n");
 	vsb_cat(sb, "/* Backend related */\n");
 	vsb_cat(sb, "void VRT_init_simple_backend(struct backend **, const struct vrt_simple_backend *);\n");
 	vsb_cat(sb, "void VRT_init_round_robin_backend(struct backend **, const struct vrt_round_robin_backend *);\n");