Move the backend timeout vars to busyobj

bin/varnishd/cache/cache_vrt_var.c

@@ -239,21 +239,19 @@ VRT_l_client_identity(struct req *req, const char *str, ...)
 
 #define BEREQ_TIMEOUT(which)					\
 void								\
-VRT_l_bereq_##which(const struct req *req, double num)		\
+VRT_l_bereq_##which(struct busyobj *bo, double num)		\
 {								\
 								\
-	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);			\
-	CHECK_OBJ_NOTNULL(req->busyobj, BUSYOBJ_MAGIC);		\
-	req->busyobj->which = (num > 0.0 ? num : 0.0);		\
+	CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);			\
+	bo->which = (num > 0.0 ? num : 0.0);			\
 }								\
 								\
 double								\
-VRT_r_bereq_##which(const struct req *req)			\
+VRT_r_bereq_##which(const struct busyobj *bo)			\
 {								\
 								\
-	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);			\
-	CHECK_OBJ_NOTNULL(req->busyobj, BUSYOBJ_MAGIC);		\
-	return(req->busyobj->which);				\
+	CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);			\
+	return (bo->which);					\
 }
 
 BEREQ_TIMEOUT(connect_timeout)

lib/libvcl/generate.py

@@ -271,19 +271,19 @@ sp_variables = (
 		'DURATION',
 		( 'pipe', 'backend_fetch', 'pass', 'miss',),
 		( 'pipe', 'backend_fetch', 'pass', 'miss',),
-		'cR'
+		'B'
 	),
 	('bereq.first_byte_timeout',
 		'DURATION',
 		( 'backend_fetch', 'pass', 'miss',),
 		( 'backend_fetch', 'pass', 'miss',),
-		'cR'
+		'B'
 	),
 	('bereq.between_bytes_timeout',
 		'DURATION',
 		( 'backend_fetch', 'pass', 'miss',),
 		( 'backend_fetch', 'pass', 'miss',),
-		'cR'
+		'B'
 	),
 	('beresp.proto',
 		'STRING',