Move the waiters into their own subdirectory where VMODs won't see them.

bin/varnishd/Makefile.am

@@ -44,11 +44,11 @@ varnishd_SOURCES = \
 	cache_vrt_re.c \
 	cache_vrt_var.c \
 	cache_vrt_vmod.c \
-	cache_waiter.c \
-	cache_waiter_epoll.c \
-	cache_waiter_kqueue.c \
-	cache_waiter_poll.c \
-	cache_waiter_ports.c \
+	waiter/cache_waiter.c \
+	waiter/cache_waiter_epoll.c \
+	waiter/cache_waiter_kqueue.c \
+	waiter/cache_waiter_poll.c \
+	waiter/cache_waiter_ports.c \
 	cache_wrk.c \
 	cache_wrw.c \
 	cache_ws.c \
@@ -81,7 +81,7 @@ noinst_HEADERS = \
 	cache.h \
 	cache_backend.h \
 	cache_esi.h \
-	cache_waiter.h \
+	waiter/cache_waiter.h \
 	common.h \
 	default_vcl.h \
 	hash_slinger.h \

bin/varnishd/cache_main.c

@@ -34,7 +34,7 @@
 
 #include "cache.h"
 
-#include "cache_waiter.h"
+#include "waiter/cache_waiter.h"
 #include "hash_slinger.h"
 
 /*--------------------------------------------------------------------

bin/varnishd/cache_panic.c

@@ -43,7 +43,7 @@
 #include "vapi/vsm_int.h"
 
 #include "cache_backend.h"
-#include "cache_waiter.h"
+#include "waiter/cache_waiter.h"
 #include "libvcl.h"
 #include "vcl.h"
 

bin/varnishd/cache_pool.c

@@ -47,7 +47,7 @@
 
 #include "cache.h"
 
-#include "cache_waiter.h"
+#include "waiter/cache_waiter.h"
 #include "hash_slinger.h"
 #include "vtcp.h"
 #include "vtim.h"

bin/varnishd/cache_session.c

@@ -40,7 +40,7 @@
 
 #include "cache.h"
 
-#include "cache_waiter.h"
+#include "waiter/cache_waiter.h"
 
 /*--------------------------------------------------------------------*/
 

bin/varnishd/flint.sh

@@ -17,6 +17,7 @@ flexelint \
 	-DVARNISH_STATE_DIR=\"foo\" \
 	*.c \
 	storage/*.c \
+	waiter/*.c \
 	../../lib/libvarnish/*.c \
 	../../lib/libvarnishcompat/execinfo.c \
 	../../lib/libvcl/*.c \

bin/varnishd/mgt_param.c

@@ -39,7 +39,7 @@
 
 #include "mgt.h"
 
-#include "cache_waiter.h"
+#include "waiter/cache_waiter.h"
 #include "heritage.h"
 #include "vav.h"
 #include "vcli.h"

bin/varnishd/cache_waiter.c → bin/varnishd/waiter/cache_waiter.c

@@ -32,7 +32,7 @@
 
 #include "cache.h"
 
-#include "cache_waiter.h"
+#include "waiter/cache_waiter.h"
 #include "vcli.h"
 #include "vcli_priv.h"
 

bin/varnishd/cache_waiter_epoll.c → bin/varnishd/waiter/cache_waiter_epoll.c

@@ -42,7 +42,7 @@
 
 #include "cache.h"
 
-#include "cache_waiter.h"
+#include "waiter/cache_waiter.h"
 #include "vtim.h"
 
 #ifndef EPOLLRDHUP

bin/varnishd/cache_waiter_kqueue.c → bin/varnishd/waiter/cache_waiter_kqueue.c

@@ -44,7 +44,7 @@
 
 #include "cache.h"
 
-#include "cache_waiter.h"
+#include "waiter/cache_waiter.h"
 #include "vtim.h"
 
 #define NKEV	100

bin/varnishd/cache_waiter_poll.c → bin/varnishd/waiter/cache_waiter_poll.c

@@ -35,7 +35,7 @@
 
 #include "cache.h"
 
-#include "cache_waiter.h"
+#include "waiter/cache_waiter.h"
 #include "vtim.h"
 
 #define NEEV	128

bin/varnishd/cache_waiter_ports.c → bin/varnishd/waiter/cache_waiter_ports.c

@@ -42,7 +42,7 @@
 
 #include "cache.h"
 
-#include "cache_waiter.h"
+#include "waiter/cache_waiter.h"
 #include "vtim.h"
 
 #define MAX_EVENTS 256