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

CLEANUP: server: slightly reorder fields in the struct to plug holes

Browse Source 
The struct server still has a lot of holes and padding that make it
quite big. By moving a few fields aronud between areas which do not
interact (e.g. boot vs aligned areas), it's quite easy to plug some
of them and/or to arrange larger ones which could be reused later with
a bit more effort. Here we've reduced holes by 40 bytes, allowing the
struct to shrink by one more cache line (64 bytes). The new size is
3840 bytes.
This commit is contained in:
Willy Tarreau 2025-08-24 12:25:51 +02:00
parent d18d972b1f
commit 8df81b6fcc
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/haproxy/server-t.h
View File

@ -359,7 +359,6 @@ struct server {
struct server *trackers; /* the list of servers tracking us, if any */ struct server *trackers; /* the list of servers tracking us, if any */
struct server *tracknext; /* next server tracking <track> in <track>'s trackers list */ struct server *tracknext; /* next server tracking <track> in <track>'s trackers list */
char *trackit; /* temporary variable to make assignment deferrable */ char *trackit; /* temporary variable to make assignment deferrable */
int consecutive_errors_limit; /* number of consecutive errors that triggers an event */
short observe, onerror; /* observing mode: one of HANA_OBS_*; what to do on error: on of ANA_ONERR_* */ short observe, onerror; /* observing mode: one of HANA_OBS_*; what to do on error: on of ANA_ONERR_* */
short onmarkeddown; /* what to do when marked down: one of HANA_ONMARKEDDOWN_* */ short onmarkeddown; /* what to do when marked down: one of HANA_ONMARKEDDOWN_* */
short onmarkedup; /* what to do when marked up: one of HANA_ONMARKEDUP_* */ short onmarkedup; /* what to do when marked up: one of HANA_ONMARKEDUP_* */
@ -399,6 +398,10 @@ struct server {
unsigned int est_need_conns; /* Estimate on the number of needed connections (max of curr and previous max_used) */ unsigned int est_need_conns; /* Estimate on the number of needed connections (max of curr and previous max_used) */
unsigned int curr_sess_idle_conns; /* Current number of idle connections attached to a session instead of idle/safe trees. */ unsigned int curr_sess_idle_conns; /* Current number of idle connections attached to a session instead of idle/safe trees. */
/* elements only used during boot, do not perturb and plug the hole */
struct guid_node guid; /* GUID global tree node */
int puid; /* proxy-unique server ID, used for SNMP, and "first" LB algo, indexed via puid_node below */
/* Element below are usd by LB algorithms and must be doable in /* Element below are usd by LB algorithms and must be doable in
* parallel to other threads reusing connections above. * parallel to other threads reusing connections above.
*/ */
@ -420,6 +423,7 @@ struct server {
int cur_sess; /* number of currently active sessions (including syn_sent) */ int cur_sess; /* number of currently active sessions (including syn_sent) */
int served; /* # of active sessions currently being served (ie not pending) */ int served; /* # of active sessions currently being served (ie not pending) */
int consecutive_errors; /* current number of consecutive errors */ int consecutive_errors; /* current number of consecutive errors */
int consecutive_errors_limit; /* number of consecutive errors that triggers an event */
struct be_counters counters; /* statistics counters */ struct be_counters counters; /* statistics counters */
/* Below are some relatively stable settings, only changed under the lock */ /* Below are some relatively stable settings, only changed under the lock */
@ -439,7 +443,6 @@ struct server {
unsigned int svc_port; /* the port to connect to (for relevant families) */ unsigned int svc_port; /* the port to connect to (for relevant families) */
unsigned down_time; /* total time the server was down */ unsigned down_time; /* total time the server was down */
int puid; /* proxy-unique server ID, used for SNMP, and "first" LB algo, indexed via puid_node below */
int tcp_ut; /* for TCP, user timeout */ int tcp_ut; /* for TCP, user timeout */
char *tcp_md5sig; /* TCP MD5 signature password (RFC2385) */ char *tcp_md5sig; /* TCP MD5 signature password (RFC2385) */
@ -475,7 +478,6 @@ struct server {
char *sni; /* SNI used for the session */ char *sni; /* SNI used for the session */
__decl_thread(HA_RWLOCK_T sess_lock); __decl_thread(HA_RWLOCK_T sess_lock);
} * reused_sess; } * reused_sess;
uint last_ssl_sess_tid; /* last tid+1 having updated reused_sess (0=none, >0=tid+1) */
struct ckch_inst *inst; /* Instance of the ckch_store in which the certificate was loaded (might be null if server has no certificate) */ struct ckch_inst *inst; /* Instance of the ckch_store in which the certificate was loaded (might be null if server has no certificate) */
__decl_thread(HA_RWLOCK_T lock); /* lock the cache and SSL_CTX during commit operations */ __decl_thread(HA_RWLOCK_T lock); /* lock the cache and SSL_CTX during commit operations */
@ -483,6 +485,7 @@ struct server {
char *ciphers; /* cipher suite to use if non-null */ char *ciphers; /* cipher suite to use if non-null */
char *ciphersuites; /* TLS 1.3 cipher suite to use if non-null */ char *ciphersuites; /* TLS 1.3 cipher suite to use if non-null */
char *curves; /* TLS curves list */ char *curves; /* TLS curves list */
uint last_ssl_sess_tid; /* last tid+1 having updated reused_sess (0=none, >0=tid+1) */
int options; /* ssl options */ int options; /* ssl options */
int verify; /* verify method (set of SSL_VERIFY_* flags) */ int verify; /* verify method (set of SSL_VERIFY_* flags) */
struct tls_version_filter methods; /* ssl methods */ struct tls_version_filter methods; /* ssl methods */
@ -494,8 +497,8 @@ struct server {
char *client_sigalgs; /* Client Signature algorithms */ char *client_sigalgs; /* Client Signature algorithms */
struct sample_expr *sni; /* sample expression for SNI */ struct sample_expr *sni; /* sample expression for SNI */
char *npn_str; /* NPN protocol string */ char *npn_str; /* NPN protocol string */
int npn_len; /* NPN protocol string length */
char *alpn_str; /* ALPN protocol string */ char *alpn_str; /* ALPN protocol string */
int npn_len; /* NPN protocol string length */
int alpn_len; /* ALPN protocol string length */ int alpn_len; /* ALPN protocol string length */
int renegotiate; /* Renegotiate mode (SSL_RENEGOTIATE_ flag) */ int renegotiate; /* Renegotiate mode (SSL_RENEGOTIATE_ flag) */
} ssl_ctx; } ssl_ctx;
@ -531,8 +534,6 @@ struct server {
event_hdl_sub_list e_subs; /* event_hdl: server's subscribers list (atomically updated) */ event_hdl_sub_list e_subs; /* event_hdl: server's subscribers list (atomically updated) */
struct guid_node guid; /* GUID global tree node */
/* warning, these structs are huge, keep them at the bottom */ /* warning, these structs are huge, keep them at the bottom */
struct conn_src conn_src; /* connection source settings */ struct conn_src conn_src; /* connection source settings */
struct sockaddr_storage addr; /* the address to connect to, doesn't include the port */ struct sockaddr_storage addr; /* the address to connect to, doesn't include the port */