r2065 - in trunk/varnish-cache: include lib/libvcl

[phk at projects.linpro.no]

Author: phk
Date: 2007-09-30 22:36:16 +0200 (Sun, 30 Sep 2007)
New Revision: 2065

Modified:
   trunk/varnish-cache/include/vcl_returns.h
   trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
   trunk/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl
Log:
Add "restart" action for most VCL methods.


Modified: trunk/varnish-cache/include/vcl_returns.h
===================================================================
--- trunk/varnish-cache/include/vcl_returns.h	2007-09-30 20:19:50 UTC (rev 2064)
+++ trunk/varnish-cache/include/vcl_returns.h	2007-09-30 20:36:16 UTC (rev 2065)
@@ -19,6 +19,7 @@
 VCL_RET_MAC(deliver, DELIVER, (1 << 7), 7)
 VCL_RET_MAC(discard, DISCARD, (1 << 8), 8)
 VCL_RET_MAC(keep, KEEP, (1 << 9), 9)
+VCL_RET_MAC(restart, RESTART, (1 << 10), 10)
 #else
 #define VCL_RET_ERROR  (1 << 0)
 #define VCL_RET_LOOKUP  (1 << 1)
@@ -30,18 +31,19 @@
 #define VCL_RET_DELIVER  (1 << 7)
 #define VCL_RET_DISCARD  (1 << 8)
 #define VCL_RET_KEEP  (1 << 9)
-#define VCL_RET_MAX 10
+#define VCL_RET_RESTART  (1 << 10)
+#define VCL_RET_MAX 11
 #endif
 
 #ifdef VCL_MET_MAC
-VCL_MET_MAC(recv,RECV,(VCL_RET_ERROR|VCL_RET_PASS|VCL_RET_PIPE|VCL_RET_LOOKUP))
-VCL_MET_MAC(pipe,PIPE,(VCL_RET_ERROR|VCL_RET_PIPE))
-VCL_MET_MAC(pass,PASS,(VCL_RET_ERROR|VCL_RET_PASS))
+VCL_MET_MAC(recv,RECV,(VCL_RET_ERROR|VCL_RET_RESTART|VCL_RET_PASS|VCL_RET_PIPE|VCL_RET_LOOKUP))
+VCL_MET_MAC(pipe,PIPE,(VCL_RET_ERROR|VCL_RET_RESTART|VCL_RET_PIPE))
+VCL_MET_MAC(pass,PASS,(VCL_RET_ERROR|VCL_RET_RESTART|VCL_RET_PASS))
 VCL_MET_MAC(hash,HASH,(VCL_RET_HASH))
-VCL_MET_MAC(miss,MISS,(VCL_RET_ERROR|VCL_RET_PASS|VCL_RET_FETCH))
-VCL_MET_MAC(hit,HIT,(VCL_RET_ERROR|VCL_RET_PASS|VCL_RET_DELIVER))
-VCL_MET_MAC(fetch,FETCH,(VCL_RET_ERROR|VCL_RET_PASS|VCL_RET_INSERT))
-VCL_MET_MAC(deliver,DELIVER,(VCL_RET_ERROR|VCL_RET_DELIVER))
+VCL_MET_MAC(miss,MISS,(VCL_RET_ERROR|VCL_RET_RESTART|VCL_RET_PASS|VCL_RET_FETCH))
+VCL_MET_MAC(hit,HIT,(VCL_RET_ERROR|VCL_RET_RESTART|VCL_RET_PASS|VCL_RET_DELIVER))
+VCL_MET_MAC(fetch,FETCH,(VCL_RET_ERROR|VCL_RET_RESTART|VCL_RET_PASS|VCL_RET_INSERT))
+VCL_MET_MAC(deliver,DELIVER,(VCL_RET_ERROR|VCL_RET_RESTART|VCL_RET_DELIVER))
 VCL_MET_MAC(timeout,TIMEOUT,(VCL_RET_FETCH|VCL_RET_DISCARD))
 VCL_MET_MAC(discard,DISCARD,(VCL_RET_DISCARD|VCL_RET_KEEP))
 #else

Modified: trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c	2007-09-30 20:19:50 UTC (rev 2064)
+++ trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c	2007-09-30 20:36:16 UTC (rev 2065)
@@ -330,6 +330,7 @@
 	vsb_cat(sb, "#define VCL_RET_DELIVER  (1 << 7)\n");
 	vsb_cat(sb, "#define VCL_RET_DISCARD  (1 << 8)\n");
 	vsb_cat(sb, "#define VCL_RET_KEEP  (1 << 9)\n");
+	vsb_cat(sb, "#define VCL_RET_RESTART  (1 << 10)\n");
 	vsb_cat(sb, "/*\n");
 	vsb_cat(sb, " * $Id$\n");
 	vsb_cat(sb, " *\n");

Modified: trunk/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl	2007-09-30 20:19:50 UTC (rev 2064)
+++ trunk/varnish-cache/lib/libvcl/vcc_gen_fixed_token.tcl	2007-09-30 20:36:16 UTC (rev 2065)
@@ -34,14 +34,14 @@
 # Second element is list of valid return actions.
 #
 set methods {
-	{recv		{error pass pipe lookup}}
-	{pipe		{error pipe}}
-	{pass		{error pass}}
+	{recv		{error restart pass pipe lookup}}
+	{pipe		{error restart pipe}}
+	{pass		{error restart pass}}
 	{hash		{hash}}
-	{miss		{error pass fetch}}
-	{hit		{error pass deliver}}
-	{fetch		{error pass insert}}
-	{deliver	{error deliver}}
+	{miss		{error restart pass fetch}}
+	{hit		{error restart pass deliver}}
+	{fetch		{error restart pass insert}}
+	{deliver	{error restart deliver}}
 	{timeout	{fetch discard}}
 	{discard	{discard keep}}
 }
@@ -59,6 +59,7 @@
 	deliver
 	discard
 	keep
+	restart
 }
 
 # Language keywords