Move vsmw from libvarnish to varnishd/common

bin/varnishd/Makefile.am

@@ -52,6 +52,7 @@ varnishd_SOURCES = \
 	cache/cache_wrk.c \
 	cache/cache_ws.c \
 	common/common_vsc.c \
+	common/common_vsmw.c \
 	hash/hash_classic.c \
 	hash/hash_critbit.c \
 	hash/hash_simple_list.c \
@@ -123,6 +124,7 @@ noinst_HEADERS = \
 	cache/cache_vgz.h \
 	common/common_param.h \
 	common/heritage.h \
+	common/vsmw.h \
 	hash/hash_slinger.h \
 	hpack/vhp.h \
 	http1/cache_http1.h \

bin/varnishd/cache/cache_shmlog.c

@@ -35,13 +35,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "common/heritage.h"
-
 #include "vend.h"
 #include "vgz.h"
 #include "vsl_priv.h"
 #include "vmb.h"
-#include "vsmw.h"
+
+#include "common/heritage.h"
+#include "common/vsmw.h"
 
 /* These cannot be struct lock, which depends on vsm/vsl working */
 static pthread_mutex_t vsl_mtx;

bin/varnishd/common/common_vsc.c

@@ -42,10 +42,10 @@
 #include "vas.h"
 #include "vmb.h"
 #include "vsc_priv.h"
-#include "vsmw.h"
 #include "vqueue.h"
 
-#include "common/heritage.h"
+#include "heritage.h"
+#include "vsmw.h"
 
 /*--------------------------------------------------------------------*/
 

lib/libvarnish/vsmw.c → bin/varnishd/common/common_vsmw.c

@@ -50,12 +50,13 @@
 #include "vas.h"
 #include "vsb.h"
 #include "miniobj.h"
-#include "vsmw.h"
 #include "vqueue.h"
 
 #include "vfil.h"
 #include "vrnd.h"
 
+#include "vsmw.h"
+
 #ifndef MAP_HASSEMAPHORE
 #  define MAP_HASSEMAPHORE 0 /* XXX Linux */
 #endif

bin/varnishd/mgt/mgt_child.c

@@ -44,8 +44,7 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#include "mgt/mgt.h"
-#include "common/heritage.h"
+#include "mgt.h"
 
 #include "vbm.h"
 #include "vcli_serve.h"
@@ -53,7 +52,9 @@
 #include "vfil.h"
 #include "vlu.h"
 #include "vtim.h"
-#include "vsmw.h"
+
+#include "common/heritage.h"
+#include "common/vsmw.h"
 
 static pid_t		child_pid = -1;
 

bin/varnishd/mgt/mgt_shmem.c

@@ -41,10 +41,11 @@
 #include <unistd.h>
 
 #include "mgt/mgt.h"
-#include "common/heritage.h"
 
 #include "vsm_priv.h"
-#include "vsmw.h"
+
+#include "common/heritage.h"
+#include "common/vsmw.h"
 
 static struct vsmw *mgt_vsmw;
 

include/Makefile.am

@@ -92,7 +92,6 @@ nobase_noinst_HEADERS = \
 	vpf.h \
 	vsc_priv.h \
 	vsl_priv.h \
-	vsmw.h \
 	vsm_priv.h \
 	vsub.h \
 	vss.h \

lib/libvarnish/Makefile.am

@@ -34,7 +34,6 @@ libvarnish_a_SOURCES = \
 	vsa.c \
 	vsb.c \
 	vsha256.c \
-	vsmw.c \
 	vss.c \
 	vsub.c \
 	vtcp.c \