[master] e527957bd cache_busyobj: gc a long obsolete peculiarity

Nils Goroll nils.goroll at uplex.de
Sun Feb 9 18:41:06 UTC 2025


commit e527957bdaaf918a101b453946842b53ceaffc35
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Sun Feb 9 19:19:50 2025 +0100

    cache_busyobj: gc a long obsolete peculiarity
    
    The "memset from one member down" is no longer needed since the per worker
    busyobj cache was removed in ec38fd337091cd5b989f02633dc0596cb2799cee.
    
    Since then, we always go through the MPL, which clears out the whole allocation
    anyway.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 9346f0980..0930fb117 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -383,10 +383,6 @@ struct busyobj {
 
 	char			*end;
 
-	/*
-	 * All fields from retries and down are zeroed when the busyobj
-	 * is recycled.
-	 */
 	unsigned		retries;
 	struct req		*req;
 	struct sess		*sp;
diff --git a/bin/varnishd/cache/cache_busyobj.c b/bin/varnishd/cache/cache_busyobj.c
index 593bdfe43..75a8c68b3 100644
--- a/bin/varnishd/cache/cache_busyobj.c
+++ b/bin/varnishd/cache/cache_busyobj.c
@@ -190,8 +190,5 @@ VBO_ReleaseBusyObj(struct worker *wrk, struct busyobj **pbo)
 	WS_Rollback(bo->ws, 0);
 #endif
 
-	memset(&bo->retries, 0,
-	    sizeof *bo - offsetof(struct busyobj, retries));
-
 	vbo_Free(&bo);
 }


More information about the varnish-commit mailing list