[OPTIM] counters: move some max numbers to the counters struct
There are a few remaining max values that need to move to counters.
Also, the counters are more often used than some config information,
so get them closer to the other useful struct members for better cache
efficiency.
diff --git a/include/types/counters.h b/include/types/counters.h
index 6bb95a0..6dfef22 100644
--- a/include/types/counters.h
+++ b/include/types/counters.h
@@ -28,6 +28,10 @@
long long cum_feconn, cum_beconn; /* cumulated number of processed sessions */
long long cum_lbconn; /* cumulated number of sessions processed by load balancing */
+ unsigned int fe_sps_max; /* maximum of new sessions per second seen on the frontend */
+ unsigned int be_sps_max; /* maximum of new sessions per second seen on the backend */
+ unsigned int nbpend_max; /* max number of pending connections with no server assigned yet */
+
long long bytes_in; /* number of bytes transferred from the client to the server */
long long bytes_out; /* number of bytes transferred from the server to the client */
@@ -51,6 +55,10 @@
};
struct srvcounters {
+ unsigned int cur_sess_max; /* max number of currently active sessions */
+ unsigned int nbpend_max; /* max number of pending connections reached */
+ unsigned int sps_max; /* maximum of new sessions per second seen on this server */
+
long long cum_sess; /* cumulated number of sessions really sent to this server */
long long cum_lbconn; /* cumulated number of sessions directed by load balancing */
diff --git a/include/types/proxy.h b/include/types/proxy.h
index aac704d..ac4b419 100644
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -197,13 +197,11 @@
} timeout;
char *id, *desc; /* proxy id (name) and description */
struct list pendconns; /* pending connections with no server assigned yet */
- int nbpend, nbpend_max; /* number of pending connections with no server assigned yet */
+ int nbpend; /* number of pending connections with no server assigned yet */
int totpend; /* total number of pending connections on this instance (for stats) */
unsigned int feconn, beconn; /* # of active frontend and backends sessions */
struct freq_ctr fe_sess_per_sec; /* sessions per second on the frontend */
- unsigned int fe_sps_max; /* maximum of new sessions per second seen on the frontend */
struct freq_ctr be_sess_per_sec; /* sessions per second on the backend */
- unsigned int be_sps_max; /* maximum of new sessions per second seen on the backend */
unsigned int maxconn; /* max # of active sessions on the frontend */
unsigned int fe_sps_lim; /* limit on new sessions per second on the frontend */
unsigned int fullconn; /* #conns on backend above which servers are used at full load */
@@ -244,6 +242,7 @@
*rsp_cap_pool;
struct pool_head *hdr_idx_pool; /* pools of pre-allocated int* used for headers indexing */
char *req_add[MAX_NEWHDR], *rsp_add[MAX_NEWHDR]; /* headers to be added */
+ struct pxcounters counters; /* statistics counters */
int grace; /* grace time after stop request */
char *check_req; /* HTTP or SSL request to use for PR_O_HTTP_CHK|PR_O_SSL3_CHK */
int check_len; /* Length of the HTTP or SSL3 request */
@@ -257,8 +256,6 @@
int no_options; /* PR_O_REDISP, PR_O_TRANSP, ... */
int no_options2; /* PR_O2_* */
- struct pxcounters counters; /* statistics counters */
-
struct {
const char *file; /* file where the section appears */
int line; /* line where the section appears */
diff --git a/include/types/server.h b/include/types/server.h
index fa01810..dae1a71 100644
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -83,10 +83,12 @@
struct proxy *proxy; /* the proxy this server belongs to */
int served; /* # of active sessions currently being served (ie not pending) */
- int cur_sess, cur_sess_max; /* number of currently active sessions (including syn_sent) */
+ int cur_sess; /* number of currently active sessions (including syn_sent) */
unsigned maxconn, minconn; /* max # of active sessions (0 = unlimited), min# for dynamic limit. */
- int nbpend, nbpend_max; /* number of pending connections */
+ int nbpend; /* number of pending connections */
int maxqueue; /* maximum number of pending connections allowed */
+ struct srvcounters counters; /* statistics counters */
+
struct list pendconns; /* pending connections */
struct task *check; /* the task associated to the health check processing */
@@ -127,11 +129,8 @@
short check_status, check_code; /* check result, check code */
struct freq_ctr sess_per_sec; /* sessions per second on this server */
- unsigned int sps_max; /* maximum of new sessions per second seen on this server */
int puid; /* proxy-unique server ID, used for SNMP */
- struct srvcounters counters; /* statistics counters */
-
struct {
const char *file; /* file where the section appears */
int line; /* line where the section appears */