mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-20 21:31:28 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: stats-file: reserve some bytes in exported structs

Browse Source 
We may need additional struct members in shm_stats_file_object and
shm_stats_file_hdr, yet since these structs are exported they should
not change in size nor ordering else it would require a version change
to break compability on purpose since mapping would differ.

Here we reserve 64 additional bytes in shm_stats_file_object, and
128 bytes in shm_stats_file_hdr for future usage.
This commit is contained in:
Aurelien DARRAGON 2025-09-03 16:07:30 +02:00
parent 21d97ccfae
commit 1a1362ea0b
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/haproxy/stats-file-t.h
View File

@ -21,7 +21,12 @@ enum stfile_domain {
* sent heartbeat will be considered down * sent heartbeat will be considered down
*/ */
/* header for shm stats file ("shm-stats-file") */ /* header for shm stats file ("shm-stats-file")
*
* exported struct:
* any change in size or ordering would represent breaking change and
* should cause a version change
*/
struct shm_stats_file_hdr { struct shm_stats_file_hdr {
/* to check if the header is compatible with current haproxy version */ /* to check if the header is compatible with current haproxy version */
struct { struct {
@ -46,11 +51,17 @@ struct shm_stats_file_hdr {
} slots[64]; } slots[64];
int objects; /* actual number of objects stored in the shm */ int objects; /* actual number of objects stored in the shm */
int objects_slots; /* total available objects slots unless map is resized */ int objects_slots; /* total available objects slots unless map is resized */
ALWAYS_PAD(128); // reserve 128 bytes for future usage
}; };
#define SHM_STATS_FILE_OBJECT_TYPE_FE 0x0 #define SHM_STATS_FILE_OBJECT_TYPE_FE 0x0
#define SHM_STATS_FILE_OBJECT_TYPE_BE 0x1 #define SHM_STATS_FILE_OBJECT_TYPE_BE 0x1
/*
* exported struct:
* any change in size or ordering would represent breaking change and
* should cause a version change
*/
struct shm_stats_file_object { struct shm_stats_file_object {
char guid[GUID_MAX_LEN + 1]; char guid[GUID_MAX_LEN + 1];
uint8_t tgid; // thread group ID from 1 to 64 uint8_t tgid; // thread group ID from 1 to 64
@ -64,6 +75,7 @@ struct shm_stats_file_object {
struct fe_counters_shared_tg fe; struct fe_counters_shared_tg fe;
struct be_counters_shared_tg be; struct be_counters_shared_tg be;
} data; } data;
ALWAYS_PAD(64); // reserve 64 bytes for future usage
}; };
#define SHM_STATS_FILE_MAPPING_SIZE(obj) (sizeof(struct shm_stats_file_hdr) + (obj) * sizeof(struct shm_stats_file_object)) #define SHM_STATS_FILE_MAPPING_SIZE(obj) (sizeof(struct shm_stats_file_hdr) + (obj) * sizeof(struct shm_stats_file_object))