[experimental-ims] 2a754e9 Rename the pool initializer to Pool_Init()

Geoff Simmons geoff at varnish-cache.org
Mon Jan 9 21:51:49 CET 2012


commit 2a754e9eb282cdf5bf65fd77f4b2479a383b6f5b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Sep 17 09:40:20 2011 +0000

    Rename the pool initializer to Pool_Init()

diff --git a/bin/varnishd/cache.h b/bin/varnishd/cache.h
index 1abd6db..5b4b575 100644
--- a/bin/varnishd/cache.h
+++ b/bin/varnishd/cache.h
@@ -839,8 +839,7 @@ void PAN_Init(void);
 void PipeSession(struct sess *sp);
 
 /* cache_pool.c */
-void WRK_Init(void);
-void WRK2_Init(void);
+void Pool_Init(void);
 int WRK_QueueSession(struct sess *sp);
 void WRK_SumStat(struct worker *w);
 int WRK_TrySumStat(struct worker *w);
@@ -937,6 +936,7 @@ void VMOD_Init(void);
 
 /* cache_wrk.c */
 
+void WRK_Init(void);
 void *WRK_thread(void *priv);
 
 /* cache_ws.c */
diff --git a/bin/varnishd/cache_main.c b/bin/varnishd/cache_main.c
index f03604d..4312393 100644
--- a/bin/varnishd/cache_main.c
+++ b/bin/varnishd/cache_main.c
@@ -116,6 +116,7 @@ child_main(void)
 	VBE_Init();
 	VBP_Init();
 	WRK_Init();
+	Pool_Init();
 
 	EXP_Init();
 	HSH_Init();
diff --git a/bin/varnishd/cache_pool.c b/bin/varnishd/cache_pool.c
index 8286162..b7f1f41 100644
--- a/bin/varnishd/cache_pool.c
+++ b/bin/varnishd/cache_pool.c
@@ -511,7 +511,7 @@ WRK_BgThread(pthread_t *thr, const char *name, bgthread_t *func, void *priv)
 /*--------------------------------------------------------------------*/
 
 void
-WRK2_Init(void)
+Pool_Init(void)
 {
 	pthread_t tp;
 
diff --git a/bin/varnishd/cache_wrk.c b/bin/varnishd/cache_wrk.c
index 5b78c19..9b3bc2b 100644
--- a/bin/varnishd/cache_wrk.c
+++ b/bin/varnishd/cache_wrk.c
@@ -156,5 +156,4 @@ void
 WRK_Init(void)
 {
 	Lck_New(&wstat_mtx, lck_wstat);
-	WRK2_Init();
 }



More information about the varnish-commit mailing list