[master] 001e77a95 cache_fetch: Pack struct busyobj better

Nils Goroll nils.goroll at uplex.de
Mon Feb 10 16:45:06 UTC 2025


commit 001e77a9524c503995fd54f11040baa0b0361c1b
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Feb 10 17:43:34 2025 +0100

    cache_fetch: Pack struct busyobj better

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 297243328..82bede0f4 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -410,11 +410,16 @@ struct busyobj {
 
 	struct pool_task	fetch_task[1];
 
+	const char		*err_reason;
+	enum director_state_e	director_state;
+	uint16_t		err_code;
+
 #define BERESP_FLAG(l, r, w, f, d) unsigned	l:1;
 #define BEREQ_FLAG(l, r, w, d) BERESP_FLAG(l, r, w, 0, d)
 #include "tbl/bereq_flags.h"
 #include "tbl/beresp_flags.h"
 
+
 	/* Timeouts */
 	vtim_dur		connect_timeout;
 	vtim_dur		first_byte_timeout;
@@ -432,7 +437,6 @@ struct busyobj {
 	const struct stevedore	*storage;
 	const struct director	*director_req;
 	const struct director	*director_resp;
-	enum director_state_e	director_state;
 	struct vcl		*vcl;
 
 	struct vsl_log		vsl[1];
@@ -440,9 +444,6 @@ struct busyobj {
 	uint8_t			digest[DIGEST_LEN];
 	struct vrt_privs	privs[1];
 
-	uint16_t		err_code;
-	const char		*err_reason;
-
 	const char		*client_identity;
 };
 


More information about the varnish-commit mailing list