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

BUILD: stats-file: fix aligment issues

Browse Source 
Document some byte holes and fix some potential aligment issues
between 32 and 64 bits architectures to ensure the shm_stats_file memory
mapping is consistent between operating systems.
This commit is contained in:
Aurelien DARRAGON 2025-09-03 15:23:16 +02:00
parent 46a5948ed2
commit 21d97ccfae
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@ struct shm_stats_file_hdr {
uint8_t major; uint8_t major;
uint8_t minor; uint8_t minor;
} version; } version;
/* 2 bytes hole */
uint global_now_ms; /* global monotonic date (ms) common to all processes using the shm */ uint global_now_ms; /* global monotonic date (ms) common to all processes using the shm */
ullong global_now_ns; /* global monotonic date (ns) common to all processes using the shm */ ullong global_now_ns; /* global monotonic date (ns) common to all processes using the shm */
llong now_offset; /* offset applied to global monotonic date on startup */ llong now_offset; /* offset applied to global monotonic date on startup */
@ -54,6 +55,7 @@ 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
uint8_t type; // SHM_STATS_FILE_OBJECT_TYPE_* to know how to handle object.data uint8_t type; // SHM_STATS_FILE_OBJECT_TYPE_* to know how to handle object.data
ALWAYS_PAD(6); // 6 bytes hole, ensure it remains the same size 32 vs 64 bits arch
uint64_t users; // bitfield that corresponds to users of the object (see shm_stats_file_hdr slots) uint64_t users; // bitfield that corresponds to users of the object (see shm_stats_file_hdr slots)
/* as the struct may hold any of the types described here, let's make it /* as the struct may hold any of the types described here, let's make it
* so it may store up to the heaviest one using an union * so it may store up to the heaviest one using an union