From 837ad0e5d1f87c84b4fe7a40cb781e6fb1f0bd91 Mon Sep 17 00:00:00 2001 From: phk Date: Thu, 20 Sep 2007 07:22:56 +0000 Subject: [PATCH] Make init an optional method for backends git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1962 d4fa192b-c00b-0410-8231-f00ffab90ce4 --- varnish-cache/bin/varnishd/cache_backend.c | 16 +++++++++++++--- .../bin/varnishd/cache_backend_simple.c | 9 --------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/varnish-cache/bin/varnishd/cache_backend.c b/varnish-cache/bin/varnishd/cache_backend.c index 3d32ca28..cad9b488 100644 --- a/varnish-cache/bin/varnishd/cache_backend.c +++ b/varnish-cache/bin/varnishd/cache_backend.c @@ -249,12 +249,22 @@ VBE_UpdateHealth(struct sess *sp, struct vbe_conn *vc, int a) /*--------------------------------------------------------------------*/ +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); } diff --git a/varnish-cache/bin/varnishd/cache_backend_simple.c b/varnish-cache/bin/varnishd/cache_backend_simple.c index 349cfc86..1822d5dd 100644 --- a/varnish-cache/bin/varnishd/cache_backend_simple.c +++ b/varnish-cache/bin/varnishd/cache_backend_simple.c @@ -347,14 +347,6 @@ bes_GetHostname(struct backend *b) /*--------------------------------------------------------------------*/ -static void -bes_Init(void) -{ - -} - -/*--------------------------------------------------------------------*/ - struct backend_method backend_method_simple = { .name = "simple", .getfd = bes_GetFd, @@ -362,7 +354,6 @@ struct backend_method backend_method_simple = { .recycle = bes_RecycleFd, .gethostname = bes_GetHostname, .cleanup = bes_Cleanup, - .init = bes_Init }; /*--------------------------------------------------------------------*/ -- 2.39.5