[master] b0858dde8 gc after connection pool rework

Nils Goroll nils.goroll at uplex.de
Wed Oct 30 06:12:08 UTC 2019


commit b0858dde8b57334ac7e21d311c8d675c8d985e1f
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Oct 30 07:09:24 2019 +0100

    gc after connection pool rework
    
    Ref: ec70dbc7502f8fbe6c8eb5af6108df4168500f9a
    
    struct vtp_cs was only used for comparisons during pool lookup

diff --git a/bin/varnishd/cache/cache_tcp_pool.c b/bin/varnishd/cache/cache_tcp_pool.c
index 5aa207f84..bb854540c 100644
--- a/bin/varnishd/cache/cache_tcp_pool.c
+++ b/bin/varnishd/cache/cache_tcp_pool.c
@@ -565,14 +565,6 @@ VCP_Wait(struct worker *wrk, struct pfd *pfd, vtim_real tmo)
 /*--------------------------------------------------------------------
  */
 
-struct vtp_cs {
-	unsigned			magic;
-#define VTP_CS_MAGIC			0xc1e40447
-	const struct suckaddr		*ip4;
-	const struct suckaddr		*ip6;
-	const char			*uds;
-};
-
 static inline int
 tmo2msec(vtim_dur tmo)
 {
@@ -687,15 +679,10 @@ VTP_Ref(const struct suckaddr *ip4, const struct suckaddr *ip6, const char *uds,
 {
 	struct tcp_pool *tp;
 	struct conn_pool *cp;
-	struct vtp_cs vcs;
 	const struct cp_methods *methods;
 
 	assert((uds != NULL && ip4 == NULL && ip6 == NULL) ||
 	    (uds == NULL && (ip4 != NULL || ip6 != NULL)));
-	INIT_OBJ(&vcs, VTP_CS_MAGIC);
-	vcs.ip4 = ip4;
-	vcs.ip6 = ip6;
-	vcs.uds = uds;
 
 	cp = VCP_Ref(id);
 	if (cp != NULL)


More information about the varnish-commit mailing list