Move the hashing implementations into a subdirectory where VMODs

won't see them.

bin/varnishd/Makefile.am

@@ -52,9 +52,9 @@ varnishd_SOURCES = \
 	cache_wrk.c \
 	cache_wrw.c \
 	cache_ws.c \
-	hash_classic.c \
-	hash_critbit.c \
-	hash_simple_list.c \
+	hash/hash_classic.c \
+	hash/hash_critbit.c \
+	hash/hash_simple_list.c \
 	mgt_child.c \
 	mgt_cli.c \
 	mgt_param.c \
@@ -84,7 +84,7 @@ noinst_HEADERS = \
 	waiter/cache_waiter.h \
 	common.h \
 	default_vcl.h \
-	hash_slinger.h \
+	hash/hash_slinger.h \
 	heritage.h \
 	mgt.h \
 	mgt_cli.h \

bin/varnishd/cache_ban.c

@@ -67,7 +67,7 @@
 
 #include "cache.h"
 
-#include "hash_slinger.h"
+#include "hash/hash_slinger.h"
 #include "vcli.h"
 #include "vcli_priv.h"
 #include "vend.h"

bin/varnishd/cache_center.c

@@ -64,7 +64,7 @@ DOT acceptor -> start [style=bold,color=green]
 
 #include "cache.h"
 
-#include "hash_slinger.h"
+#include "hash/hash_slinger.h"
 #include "vcl.h"
 #include "vcli_priv.h"
 #include "vsha256.h"

bin/varnishd/cache_cli.c

@@ -41,7 +41,7 @@
 #include "cache.h"
 
 #include "cache_backend.h"		// struct vbc
-#include "hash_slinger.h"		// objhead
+#include "hash/hash_slinger.h"		// struct objhead
 #include "vcli.h"
 #include "vcli_common.h"
 #include "vcli_priv.h"

bin/varnishd/cache_expire.c

@@ -56,7 +56,7 @@
 #include "cache.h"
 
 #include "binary_heap.h"
-#include "hash_slinger.h"
+#include "hash/hash_slinger.h"
 #include "vtim.h"
 
 static pthread_t exp_thread;

bin/varnishd/cache_hash.c

@@ -58,7 +58,7 @@
 
 #include "cache.h"
 
-#include "hash_slinger.h"
+#include "hash/hash_slinger.h"
 #include "vav.h"
 #include "vsha256.h"
 

bin/varnishd/cache_main.c

@@ -35,7 +35,7 @@
 #include "cache.h"
 
 #include "waiter/cache_waiter.h"
-#include "hash_slinger.h"
+#include "hash/hash_slinger.h"
 
 /*--------------------------------------------------------------------
  * Per thread storage for the session currently being processed by

bin/varnishd/cache_pool.c

@@ -48,7 +48,6 @@
 #include "cache.h"
 
 #include "waiter/cache_waiter.h"
-#include "hash_slinger.h"
 #include "vtcp.h"
 #include "vtim.h"
 
@@ -262,9 +261,7 @@ Pool_Work_Thread(void *priv, struct worker *w)
 			AZ(w->sp->wrk);
 			THR_SetSession(w->sp);
 			w->sp->wrk = w;
-			CHECK_OBJ_ORNULL(w->nobjhead, OBJHEAD_MAGIC);
 			CNT_Session(w->sp);
-			CHECK_OBJ_ORNULL(w->nobjhead, OBJHEAD_MAGIC);
 			THR_SetSession(NULL);
 			w->sp = NULL;
 

bin/varnishd/cache_vrt.c

@@ -40,7 +40,7 @@
 #include "cache.h"
 
 #include "cache_backend.h"
-#include "hash_slinger.h"
+#include "hash/hash_slinger.h"
 #include "vav.h"
 #include "vcl.h"
 #include "vrt.h"

bin/varnishd/cache_wrk.c

@@ -36,7 +36,7 @@
 
 #include "cache.h"
 
-#include "hash_slinger.h"
+#include "hash/hash_slinger.h"
 #include "vsha256.h"
 
 static struct lock		wstat_mtx;

bin/varnishd/hash_classic.c → bin/varnishd/hash/hash_classic.c

@@ -36,7 +36,7 @@
 
 #include "cache.h"
 
-#include "hash_slinger.h"
+#include "hash/hash_slinger.h"
 
 /*--------------------------------------------------------------------*/
 

bin/varnishd/hash_critbit.c → bin/varnishd/hash/hash_critbit.c

@@ -36,7 +36,7 @@
 
 #include "cache.h"
 
-#include "hash_slinger.h"
+#include "hash/hash_slinger.h"
 #include "vcli_priv.h"
 #include "vmb.h"
 #include "vtim.h"

bin/varnishd/hash_simple_list.c → bin/varnishd/hash/hash_simple_list.c

@@ -33,7 +33,7 @@
 
 #include "cache.h"
 
-#include "hash_slinger.h"
+#include "hash/hash_slinger.h"
 
 /*--------------------------------------------------------------------*/
 

bin/varnishd/storage/storage_persistent.c

@@ -46,7 +46,7 @@
 #include "cache.h"
 #include "storage/storage.h"
 
-#include "hash_slinger.h"
+#include "hash/hash_slinger.h"
 #include "vcli.h"
 #include "vcli_priv.h"
 #include "vend.h"

bin/varnishd/storage/storage_persistent_silo.c

@@ -40,7 +40,7 @@
 #include "cache.h"
 #include "storage/storage.h"
 
-#include "hash_slinger.h"
+#include "hash/hash_slinger.h"
 #include "vsha256.h"
 #include "vtim.h"
 

bin/varnishd/varnishd.c

@@ -45,7 +45,7 @@
 
 #include "mgt.h"
 
-#include "hash_slinger.h"
+#include "hash/hash_slinger.h"
 #include "heritage.h"
 #include "vav.h"
 #include "vcli.h"