r2192 - in branches/1.2: . bin/varnishd include

[des at projects.linpro.no]

Author: des
Date: 2007-10-30 11:45:28 +0100 (Tue, 30 Oct 2007)
New Revision: 2192

Modified:
   branches/1.2/
   branches/1.2/bin/varnishd/cache.h
   branches/1.2/bin/varnishd/cache_vcl.c
   branches/1.2/include/shmlog_tags.h
Log:
Merged revisions 2175-2176 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2175 | phk | 2007-10-29 08:46:12 +0100 (Mon, 29 Oct 2007) | 2 lines
  
  Add a VCL_error shmtag
........
  r2176 | phk | 2007-10-29 08:53:01 +0100 (Mon, 29 Oct 2007) | 2 lines
  
  Give VRT code a chance to see which method we are in.
........



Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2175-2176

Modified: branches/1.2/bin/varnishd/cache.h
===================================================================
--- branches/1.2/bin/varnishd/cache.h	2007-10-30 10:43:32 UTC (rev 2191)
+++ branches/1.2/bin/varnishd/cache.h	2007-10-30 10:45:28 UTC (rev 2192)
@@ -303,6 +303,7 @@
 	double			t_end;
 
 	enum step		step;
+	unsigned		cur_method;
 	unsigned 		handling;
 	unsigned char		wantbody;
 	int			err_code;

Modified: branches/1.2/bin/varnishd/cache_vcl.c
===================================================================
--- branches/1.2/bin/varnishd/cache_vcl.c	2007-10-30 10:43:32 UTC (rev 2191)
+++ branches/1.2/bin/varnishd/cache_vcl.c	2007-10-30 10:45:28 UTC (rev 2192)
@@ -298,15 +298,17 @@
 
 #define VCL_RET_MAC(l,u,b,n)
 
-#define VCL_MET_MAC(func, xxx, bitmap) 					\
+#define VCL_MET_MAC(func, upper, bitmap)				\
 void									\
 VCL_##func##_method(struct sess *sp)					\
 {									\
 									\
 	sp->handling = 0;						\
+	sp->cur_method = VCL_MET_ ## upper;				\
 	WSP(sp, SLT_VCL_call, "%s", #func); 				\
 	sp->vcl->func##_func(sp);					\
 	WSP(sp, SLT_VCL_return, "%s", vcl_handlingname(sp->handling));	\
+	sp->cur_method = 0;						\
 	assert(sp->handling & bitmap);					\
 	assert(!(sp->handling & ~bitmap));				\
 }

Modified: branches/1.2/include/shmlog_tags.h
===================================================================
--- branches/1.2/include/shmlog_tags.h	2007-10-30 10:43:32 UTC (rev 2191)
+++ branches/1.2/include/shmlog_tags.h	2007-10-30 10:45:28 UTC (rev 2192)
@@ -84,6 +84,7 @@
 SLTM(VCL_call)
 SLTM(VCL_trace)
 SLTM(VCL_return)
+SLTM(VCL_error)
 SLTM(ReqStart)
 SLTM(Hit)
 SLTM(HitPass)