[master] 5ec7935 Remove the VSC for number of vcls referencing a backend, it is always one now.
Poul-Henning Kamp
phk at FreeBSD.org
Mon Mar 2 10:29:08 CET 2015
commit 5ec7935bda68395c55b8a9d1b750b4eb9100c0b3
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Mar 2 09:28:26 2015 +0000
Remove the VSC for number of vcls referencing a backend, it is always one
now.
Rename VBE_Drop() to VBE_DeleteBackend()
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 458eea7..3aad027 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -356,7 +356,7 @@ VRT_fini_vbe(VRT_CTX, struct director **dp, const struct vrt_backend *vrt)
if (vrt->probe != NULL)
VBP_Remove(be, vrt->probe);
- VBE_Drop(be);
+ VBE_DeleteBackend(be);
free(d->vcl_name);
FREE_OBJ(d);
}
diff --git a/bin/varnishd/cache/cache_backend.h b/bin/varnishd/cache/cache_backend.h
index 1a52232..72e57af 100644
--- a/bin/varnishd/cache/cache_backend.h
+++ b/bin/varnishd/cache/cache_backend.h
@@ -104,7 +104,7 @@ struct vbc {
};
/* cache_backend_cfg.c */
-void VBE_Drop(struct backend *);
+void VBE_DeleteBackend(struct backend *);
unsigned VBE_Healthy(const struct backend *b, double *changed);
struct backend *VBE_AddBackend(const struct vrt_backend *vb);
diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index 9a80a4b..37431f5 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -55,13 +55,12 @@ static VTAILQ_HEAD(, backend) backends = VTAILQ_HEAD_INITIALIZER(backends);
*/
void
-VBE_Drop(struct backend *b)
+VBE_DeleteBackend(struct backend *b)
{
ASSERT_CLI();
CHECK_OBJ_NOTNULL(b, BACKEND_MAGIC);
- b->vsc->vcls--;
VTAILQ_REMOVE(&backends, b, list);
free(b->ipv4);
free(b->ipv6);
@@ -99,7 +98,6 @@ VBE_AddBackend(const struct vrt_backend *vb)
vb->ipv6_addr == NULL ? "" : vb->ipv6_addr, vb->port);
b->vsc = VSM_Alloc(sizeof *b->vsc, VSC_CLASS, VSC_type_vbe, buf);
- b->vsc->vcls++;
b->vcl_name = vb->vcl_name;
REPLACE(b->display_name, buf);
diff --git a/include/tbl/vsc_fields.h b/include/tbl/vsc_fields.h
index 7b06a8c..b456d9f 100644
--- a/include/tbl/vsc_fields.h
+++ b/include/tbl/vsc_fields.h
@@ -179,10 +179,6 @@ VSC_F(g_smf_large, uint64_t, 0, 'g', 'i', info,
#ifdef VSC_DO_VBE
-VSC_F(vcls, uint64_t, 0, 'g', 'i', debug,
- "VCL references",
- ""
-)
VSC_F(happy, uint64_t, 0, 'b', 'b', info,
"Happy health probes",
""
More information about the varnish-commit
mailing list