Mailing List Archive

Author: phk
Date: 2008-02-19 12:52:27 +0100 (Tue, 19 Feb 2008)
New Revision: 2515

Modified:
trunk/varnish-cache/bin/varnishd/cache.h
trunk/varnish-cache/bin/varnishd/cache_acceptor.c
trunk/varnish-cache/bin/varnishd/cache_acceptor_epoll.c
trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
trunk/varnish-cache/bin/varnishd/cache_acceptor_poll.c
trunk/varnish-cache/bin/varnishd/cache_backend.c
trunk/varnish-cache/bin/varnishd/cache_center.c
trunk/varnish-cache/bin/varnishd/cache_cli.c
trunk/varnish-cache/bin/varnishd/cache_expire.c
trunk/varnish-cache/bin/varnishd/cache_fetch.c
trunk/varnish-cache/bin/varnishd/cache_hash.c
trunk/varnish-cache/bin/varnishd/cache_http.c
trunk/varnish-cache/bin/varnishd/cache_main.c
trunk/varnish-cache/bin/varnishd/cache_pipe.c
trunk/varnish-cache/bin/varnishd/cache_pool.c
trunk/varnish-cache/bin/varnishd/cache_response.c
trunk/varnish-cache/bin/varnishd/cache_session.c
trunk/varnish-cache/bin/varnishd/cache_synthetic.c
trunk/varnish-cache/bin/varnishd/cache_vrt.c
trunk/varnish-cache/bin/varnishd/cache_vrt_esi.c
trunk/varnish-cache/bin/varnishd/cache_ws.c
trunk/varnish-cache/bin/varnishd/rfc2616.c
trunk/varnish-cache/bin/varnishd/shmlog.c
trunk/varnish-cache/bin/varnishd/stevedore.c
trunk/varnish-cache/bin/varnishd/tcp.c
Log:
Move the #include of heritage.h to cache.h.


Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache.h 2008-02-19 11:52:27 UTC (rev 2515)
@@ -47,6 +47,7 @@

#include "vcl_returns.h"
#include "common.h"
+#include "heritage.h"
#include "miniobj.h"

enum {

Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -50,7 +50,6 @@
#include "compat/srandomdev.h"
#endif

-#include "heritage.h"
#include "shmlog.h"
#include "cache.h"
#include "cache_acceptor.h"

Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor_epoll.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor_epoll.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor_epoll.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -43,7 +43,6 @@

#include <sys/epoll.h>

-#include "heritage.h"
#include "shmlog.h"
#include "cache.h"
#include "cache_acceptor.h"

Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -46,7 +46,6 @@

#include <sys/event.h>

-#include "heritage.h"
#include "shmlog.h"
#include "cache.h"
#include "cache_acceptor.h"

Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor_poll.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor_poll.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor_poll.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -41,7 +41,6 @@
#include <unistd.h>
#include <poll.h>

-#include "heritage.h"
#include "shmlog.h"
#include "cache.h"
#include "cache_acceptor.h"

Modified: trunk/varnish-cache/bin/varnishd/cache_backend.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_backend.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -77,7 +77,6 @@
#include <sys/socket.h>
#include <netdb.h>

-#include "heritage.h"
#include "shmlog.h"
#include "cache.h"
#include "vrt.h"

Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -71,7 +71,6 @@

#include "shmlog.h"
#include "vcl.h"
-#include "heritage.h"
#include "cache.h"

static unsigned xids;

Modified: trunk/varnish-cache/bin/varnishd/cache_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_cli.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_cli.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -45,7 +45,6 @@
#include "cache.h"
#include "vlu.h"
#include "vsb.h"
-#include "heritage.h"

pthread_t cli_thread;


Modified: trunk/varnish-cache/bin/varnishd/cache_expire.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_expire.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_expire.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -47,7 +47,6 @@
#include "shmlog.h"
#include "binary_heap.h"
#include "cache.h"
-#include "heritage.h"

static pthread_t exp_thread;
static struct binheap *exp_heap;

Modified: trunk/varnish-cache/bin/varnishd/cache_fetch.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_fetch.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_fetch.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -39,7 +39,6 @@

#include "shmlog.h"
#include "cache.h"
-#include "heritage.h"
#include "stevedore.h"

/*--------------------------------------------------------------------*/

Modified: trunk/varnish-cache/bin/varnishd/cache_hash.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_hash.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_hash.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -62,7 +62,6 @@

#include "shmlog.h"
#include "cache.h"
-#include "heritage.h"
#include "stevedore.h"

static struct hash_slinger *hash;
@@ -387,7 +386,6 @@
HSH_Init(void)
{

- hash = heritage.hash;
if (hash->start != NULL)
hash->start();
}

Modified: trunk/varnish-cache/bin/varnishd/cache_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_http.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_http.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -42,7 +42,6 @@
#include <string.h>
#include <strings.h>

-#include "heritage.h"
#include "shmlog.h"
#include "cache.h"


Modified: trunk/varnish-cache/bin/varnishd/cache_main.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_main.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_main.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -38,7 +38,6 @@

#include "shmlog.h"
#include "cache.h"
-#include "heritage.h"
#include "stevedore.h"

/*--------------------------------------------------------------------

Modified: trunk/varnish-cache/bin/varnishd/cache_pipe.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pipe.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_pipe.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -41,7 +41,6 @@
#include <sys/socket.h>

#include "shmlog.h"
-#include "heritage.h"
#include "cache.h"

static int

Modified: trunk/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pool.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_pool.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -53,7 +53,6 @@
#include <string.h>
#include <unistd.h>

-#include "heritage.h"
#include "shmlog.h"
#include "vcl.h"
#include "cli_priv.h"

Modified: trunk/varnish-cache/bin/varnishd/cache_response.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_response.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_response.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -38,7 +38,6 @@
#include <stdlib.h>

#include "shmlog.h"
-#include "heritage.h"
#include "cache.h"

/*--------------------------------------------------------------------*/

Modified: trunk/varnish-cache/bin/varnishd/cache_session.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_session.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_session.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -56,7 +56,6 @@
#include <sys/uio.h>
#include <sys/socket.h>

-#include "heritage.h"
#include "shmlog.h"
#include "cache.h"


Modified: trunk/varnish-cache/bin/varnishd/cache_synthetic.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_synthetic.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_synthetic.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -37,7 +37,6 @@

#include "shmlog.h"
#include "cache.h"
-#include "heritage.h"
#include "stevedore.h"

/*

Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -44,7 +44,6 @@
#include <stdarg.h>

#include "shmlog.h"
-#include "heritage.h"
#include "vrt.h"
#include "vrt_obj.h"
#include "vcl.h"

Modified: trunk/varnish-cache/bin/varnishd/cache_vrt_esi.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt_esi.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt_esi.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -50,7 +50,6 @@
#include <stdarg.h>

#include "shmlog.h"
-#include "heritage.h"
#include "vrt.h"
#include "vcl.h"
#include "cache.h"

Modified: trunk/varnish-cache/bin/varnishd/cache_ws.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ws.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/cache_ws.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -41,7 +41,6 @@
#include <string.h>
#include <unistd.h>

-#include "heritage.h"
#include "shmlog.h"
#include "vcl.h"
#include "cli_priv.h"

Modified: trunk/varnish-cache/bin/varnishd/rfc2616.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/rfc2616.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/rfc2616.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -39,7 +39,6 @@

#include "shmlog.h"
#include "cache.h"
-#include "heritage.h"


/*--------------------------------------------------------------------

Modified: trunk/varnish-cache/bin/varnishd/shmlog.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/shmlog.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/shmlog.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -43,8 +43,6 @@
#include "shmlog.h"
#include "cache.h"

-#include "heritage.h"
-
#define LOCKSHM(foo) \
do { \
if (pthread_mutex_trylock(foo)) { \

Modified: trunk/varnish-cache/bin/varnishd/stevedore.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/stevedore.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/stevedore.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -35,7 +35,6 @@
#include <string.h>

#include "cache.h"
-#include "heritage.h"
#include "stevedore.h"

/*

Modified: trunk/varnish-cache/bin/varnishd/tcp.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/tcp.c 2008-02-19 11:10:12 UTC (rev 2514)
+++ trunk/varnish-cache/bin/varnishd/tcp.c 2008-02-19 11:52:27 UTC (rev 2515)
@@ -47,7 +47,6 @@
#include "compat/strlcpy.h"
#endif

-#include "heritage.h"
#include "mgt.h"

/*--------------------------------------------------------------------*/