r1962 - trunk/varnish-cache/bin/varnishd
phk at projects.linpro.no
phk at projects.linpro.no
Thu Sep 20 09:22:56 CEST 2007
Author: phk
Date: 2007-09-20 09:22:56 +0200 (Thu, 20 Sep 2007)
New Revision: 1962
Modified:
trunk/varnish-cache/bin/varnishd/cache_backend.c
trunk/varnish-cache/bin/varnishd/cache_backend_simple.c
Log:
Make init an optional method for backends
Modified: trunk/varnish-cache/bin/varnishd/cache_backend.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend.c 2007-09-20 07:19:34 UTC (rev 1961)
+++ trunk/varnish-cache/bin/varnishd/cache_backend.c 2007-09-20 07:22:56 UTC (rev 1962)
@@ -249,12 +249,22 @@
/*--------------------------------------------------------------------*/
+static void
+VBE_AddBackendMethod(struct backend_method *bem)
+{
+
+ if (bem->init != NULL)
+ bem->init();
+}
+
+/*--------------------------------------------------------------------*/
+
void
VBE_Init(void)
{
MTX_INIT(&VBE_mtx);
- backend_method_simple.init();
- backend_method_random.init();
- backend_method_round_robin.init();
+ VBE_AddBackendMethod(&backend_method_simple);
+ VBE_AddBackendMethod(&backend_method_random);
+ VBE_AddBackendMethod(&backend_method_round_robin);
}
Modified: trunk/varnish-cache/bin/varnishd/cache_backend_simple.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend_simple.c 2007-09-20 07:19:34 UTC (rev 1961)
+++ trunk/varnish-cache/bin/varnishd/cache_backend_simple.c 2007-09-20 07:22:56 UTC (rev 1962)
@@ -347,14 +347,6 @@
/*--------------------------------------------------------------------*/
-static void
-bes_Init(void)
-{
-
-}
-
-/*--------------------------------------------------------------------*/
-
struct backend_method backend_method_simple = {
.name = "simple",
.getfd = bes_GetFd,
@@ -362,7 +354,6 @@
.recycle = bes_RecycleFd,
.gethostname = bes_GetHostname,
.cleanup = bes_Cleanup,
- .init = bes_Init
};
/*--------------------------------------------------------------------*/
More information about the varnish-commit
mailing list