[master] 8cbb4d1e6 varnishd: kill the killlist

Nils Goroll nils.goroll at uplex.de
Mon Feb 19 11:47:05 UTC 2024


commit 8cbb4d1e671b8070a55822f20b95a8f6790f17d8
Author: Asad Sajjad Ahmed <asadsa at varnish-software.com>
Date:   Mon Feb 19 11:47:43 2024 +0100

    varnishd: kill the killlist
    
    Since, we seems to not use it at all.
    
    Signed-off-by: Asad Sajjad Ahmed <asadsa at varnish-software.com>

diff --git a/bin/varnishd/cache/cache_conn_pool.c b/bin/varnishd/cache/cache_conn_pool.c
index 438082c16..131fc20da 100644
--- a/bin/varnishd/cache/cache_conn_pool.c
+++ b/bin/varnishd/cache/cache_conn_pool.c
@@ -95,7 +95,6 @@ struct conn_pool {
 	VTAILQ_HEAD(, pfd)			connlist;
 	int					n_conn;
 
-	VTAILQ_HEAD(, pfd)			killlist;
 	int					n_kill;
 
 	int					n_used;
@@ -180,7 +179,6 @@ vcp_handle(struct waited *w, enum wait_event ev, vtim_real now)
 	case PFD_STATE_CLEANUP:
 		cp->methods->close(pfd);
 		cp->n_kill--;
-		VTAILQ_REMOVE(&cp->killlist, pfd, list);
 		memset(pfd, 0x11, sizeof *pfd);
 		free(pfd);
 		break;
@@ -234,7 +232,6 @@ VCP_Rel(struct conn_pool **cpp)
 		assert(pfd->state == PFD_STATE_AVAIL);
 		pfd->state = PFD_STATE_CLEANUP;
 		(void)shutdown(pfd->fd, SHUT_WR);
-		VTAILQ_INSERT_TAIL(&cp->killlist, pfd, list);
 		cp->n_kill++;
 	}
 	while (cp->n_kill) {
@@ -419,7 +416,6 @@ VCP_Close(struct pfd **pfdp)
 		(void)shutdown(pfd->fd, SHUT_RDWR);
 		VTAILQ_REMOVE(&cp->connlist, pfd, list);
 		pfd->state = PFD_STATE_CLEANUP;
-		VTAILQ_INSERT_HEAD(&cp->killlist, pfd, list);
 		cp->n_kill++;
 	} else {
 		assert(pfd->state == PFD_STATE_USED);
@@ -738,7 +734,6 @@ VCP_Ref(const struct vrt_endpoint *vep, const char *ident)
 		cp->methods = &vtp_methods;
 	Lck_New(&cp->mtx, lck_conn_pool);
 	VTAILQ_INIT(&cp->connlist);
-	VTAILQ_INIT(&cp->killlist);
 
 	CHECK_OBJ_NOTNULL(cp, CONN_POOL_MAGIC);
 	Lck_Lock(&conn_pools_mtx);


More information about the varnish-commit mailing list