[master] 1291533 Move more of the sharp knives away from $ABI VRT
Poul-Henning Kamp
phk at FreeBSD.org
Mon Oct 2 08:49:08 UTC 2017
commit 1291533566d8def6298e6e8d37d05f5113ad8b3b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Oct 2 08:36:20 2017 +0000
Move more of the sharp knives away from $ABI VRT
diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index a0586c5..e67f89f 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -44,14 +44,6 @@
/*--------------------------------------------------------------------*/
-enum req_fsm_nxt {
- REQ_FSM_MORE,
- REQ_FSM_DONE,
- REQ_FSM_DISEMBARK,
-};
-
-/*--------------------------------------------------------------------*/
-
enum body_status {
#define BODYSTATUS(U,l) BS_##U,
#include "tbl/body_status.h"
@@ -877,26 +869,7 @@ ssize_t VRB_Cache(struct req *, ssize_t maxsize);
ssize_t VRB_Iterate(struct req *, objiterate_f *func, void *priv);
void VRB_Free(struct req *);
-/* cache_req_fsm.c [CNT] */
-enum req_fsm_nxt CNT_Request(struct worker *, struct req *);
-
/* cache_session.c [SES] */
-void SES_Wait(struct sess *, const struct transport *);
-void SES_Ref(struct sess *sp);
-void SES_Rel(struct sess *sp);
-int SES_Reschedule_Req(struct req *);
-
-enum htc_status_e {
- HTC_S_JUNK = -5,
- HTC_S_CLOSE = -4,
- HTC_S_TIMEOUT = -3,
- HTC_S_OVERFLOW = -2,
- HTC_S_EOF = -1,
- HTC_S_EMPTY = 0,
- HTC_S_MORE = 1,
- HTC_S_COMPLETE = 2,
- HTC_S_IDLE = 3,
-};
void HTC_RxInit(struct http_conn *htc, struct ws *ws);
void HTC_RxPipeline(struct http_conn *htc, void *);
diff --git a/bin/varnishd/cache/cache_varnishd.h b/bin/varnishd/cache/cache_varnishd.h
index ca00a44..d81edcf 100644
--- a/bin/varnishd/cache/cache_varnishd.h
+++ b/bin/varnishd/cache/cache_varnishd.h
@@ -156,9 +156,35 @@ int Pool_Task_Any(struct pool_task *task, enum task_prio prio);
/* cache_range.c [VRG] */
void VRG_dorange(struct req *req, const char *r);
+/* cache_req_fsm.c [CNT] */
+
+enum req_fsm_nxt {
+ REQ_FSM_MORE,
+ REQ_FSM_DONE,
+ REQ_FSM_DISEMBARK,
+};
+
+enum req_fsm_nxt CNT_Request(struct worker *, struct req *);
+
/* cache_session.c */
void SES_NewPool(struct pool *, unsigned pool_no);
void SES_DestroyPool(struct pool *);
+void SES_Wait(struct sess *, const struct transport *);
+void SES_Ref(struct sess *sp);
+void SES_Rel(struct sess *sp);
+int SES_Reschedule_Req(struct req *);
+
+enum htc_status_e {
+ HTC_S_JUNK = -5,
+ HTC_S_CLOSE = -4,
+ HTC_S_TIMEOUT = -3,
+ HTC_S_OVERFLOW = -2,
+ HTC_S_EOF = -1,
+ HTC_S_EMPTY = 0,
+ HTC_S_MORE = 1,
+ HTC_S_COMPLETE = 2,
+ HTC_S_IDLE = 3,
+};
/* cache_shmlog.c */
extern struct VSC_main *VSC_C_main;
More information about the varnish-commit
mailing list