Rename "pipe" to "http1 pipe", (VTLA: V1P)

bin/varnishd/Makefile.am

@@ -28,6 +28,7 @@ varnishd_SOURCES = \
 	cache/cache_http.c \
 	cache/cache_http1_fetch.c \
 	cache/cache_http1_fsm.c \
+	cache/cache_http1_pipe.c \
 	cache/cache_http1_proto.c \
 	cache/cache_http1_vfp.c \
 	cache/cache_lck.c \
@@ -35,7 +36,6 @@ varnishd_SOURCES = \
 	cache/cache_mempool.c \
 	cache/cache_obj.c \
 	cache/cache_panic.c \
-	cache/cache_pipe.c \
 	cache/cache_pool.c \
 	cache/cache_req_body.c \
 	cache/cache_req_fsm.c \

bin/varnishd/cache/cache.h

@@ -746,6 +746,10 @@ unsigned V1D_FlushReleaseAcct(struct req *req);
 void V1D_Deliver(struct req *, struct busyobj *);
 void V1D_Deliver_Synth(struct req *req);
 
+/* cache_http1_pipe.c */
+void V1P_Init(void);
+void V1P_Process(struct req *req, struct busyobj *bo);
+
 /* cache_req_body.c */
 int VRB_Ignore(struct req *req);
 int VRB_Cache(struct req *req, ssize_t maxsize);
@@ -1010,10 +1014,6 @@ void PAN_Init(void);
 const char *body_status_2str(enum body_status e);
 const char *sess_close_2str(enum sess_close sc, int want_desc);
 
-/* cache_pipe.c */
-void Pipe_Init(void);
-void PipeRequest(struct req *req, struct busyobj *bo);
-
 /* cache_pool.c */
 void Pool_Init(void);
 void Pool_Accept(void);

bin/varnishd/cache/cache_pipe.c → bin/varnishd/cache/cache_http1_pipe.c

@@ -93,7 +93,7 @@ pipecharge(struct req *req, const struct acct_pipe *a, struct VSC_C_vbe *b)
 }
 
 void
-PipeRequest(struct req *req, struct busyobj *bo)
+V1P_Process(struct req *req, struct busyobj *bo)
 {
 	struct vbc *vc;
 	struct worker *wrk;
@@ -190,7 +190,7 @@ PipeRequest(struct req *req, struct busyobj *bo)
 /*--------------------------------------------------------------------*/
 
 void
-Pipe_Init(void)
+V1P_Init(void)
 {
 
 	Lck_New(&pipestat_mtx, lck_pipestat);

bin/varnishd/cache/cache_main.c

@@ -225,7 +225,7 @@ child_main(void)
 	VBE_InitCfg();
 	VBP_Init();
 	Pool_Init();
-	Pipe_Init();
+	V1P_Init();
 
 	EXP_Init();
 	HSH_Init(heritage.hash);

bin/varnishd/cache/cache_req_fsm.c

@@ -499,7 +499,7 @@ cnt_pipe(struct worker *wrk, struct req *req)
 		INCOMPL();
 	assert(wrk->handling == VCL_RET_PIPE);
 
-	PipeRequest(req, bo);
+	V1P_Process(req, bo);
 	assert(WRW_IsReleased(wrk));
 	http_Teardown(bo->bereq);
 	THR_SetBusyobj(NULL);