[master] 56b1415d4 cache.h: defrag struct vsl_log

Nils Goroll nils.goroll at uplex.de
Sun Jul 13 14:43:06 UTC 2025


commit 56b1415d4029a114d6d88824959acc17cf6d0c2d
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Sun Jul 13 16:40:26 2025 +0200

    cache.h: defrag struct vsl_log
    
    There was a hole in it since we made vxid_t 64bit
    
    (gdb) ptype /o struct vsl_log
    /* offset      |    size */  type = struct vsl_log {
    /*      0      |       8 */    uint32_t *wlb;
    /*      8      |       8 */    uint32_t *wlp;
    /*     16      |       8 */    uint32_t *wle;
    /*     24      |       4 */    unsigned int wlr;
    /* XXX  4-byte hole      */
    /*     32      |       8 */    vxid_t wid;
    
                                   /* total size (bytes):   40 */
                                 }

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index c94615395..fd6cdfab8 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -193,8 +193,8 @@ struct acct_bereq {
 
 struct vsl_log {
 	uint32_t		*wlb, *wlp, *wle;
-	unsigned		wlr;
 	vxid_t			wid;
+	unsigned		wlr;
 };
 
 /*--------------------------------------------------------------------*/


More information about the varnish-commit mailing list