mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-30 15:21:04 +01:00
Code Issues Projects Releases Wiki Activity

[MINOR] stats: factorize many chunk_printf()

Browse Source 
Improve code size, speed and readability by factoring many
calls to chunk_printf().
This commit is contained in:
Willy Tarreau 2007-01-01 22:01:43 +01:00
parent c0dde7a8ed
commit 128e954663
1 changed files with 68 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
src/proto_http.c
View File

@ -3047,37 +3047,28 @@ int produce_content_stats_proxy(struct session *s, struct proxy *px)
case DATA_ST_PX_FE: case DATA_ST_PX_FE:
/* print the frontend */ /* print the frontend */
if (px->cap & PR_CAP_FE) { if (px->cap & PR_CAP_FE) {
chunk_printf(&msg, sizeof(trash),
/* name, queue */ /* name, queue */
chunk_printf(&msg, sizeof(trash), "<tr align=center class=\"frontend\"><td>Frontend</td><td colspan=2></td>"
"<tr align=center class=\"frontend\"><td>Frontend</td><td colspan=2></td>");
/* sessions : current, max, limit, cumul. */ /* sessions : current, max, limit, cumul. */
chunk_printf(&msg, sizeof(trash), "<td align=right>%d</td><td align=right>%d</td><td align=right>%d</td><td align=right>%d</td>"
"<td align=right>%d</td><td align=right>%d</td><td align=right>%d</td><td align=right>%d</td>",
px->feconn, px->feconn_max, px->maxconn, px->cum_feconn);
/* bytes : in, out */ /* bytes : in, out */
chunk_printf(&msg, sizeof(trash), "<td align=right></td><td align=right></td>"
"<td align=right></td><td align=right></td>");
/* denied: req, resp */ /* denied: req, resp */
chunk_printf(&msg, sizeof(trash), "<td align=right>%d</td><td align=right>%d</td>"
"<td align=right>%d</td><td align=right>%d</td>",
px->denied_req, px->denied_resp);
/* errors : request, connect, response */ /* errors : request, connect, response */
chunk_printf(&msg, sizeof(trash), "<td align=right>%d</td><td align=right></td><td align=right></td>"
"<td align=right>%d</td><td align=right></td><td align=right></td>",
px->failed_req);
/* server status : reflect backend status */ /* server status : reflect backend status */
chunk_printf(&msg, sizeof(trash), "<td align=center>%s</td>", "<td align=center>%s</td>"
/* rest of server: nothing */
"<td align=center colspan=5></td></tr>"
"",
px->feconn, px->feconn_max, px->maxconn, px->cum_feconn,
px->denied_req, px->denied_resp,
px->failed_req,
px->state == PR_STRUN ? "OPEN" : px->state == PR_STRUN ? "OPEN" :
px->state == PR_STIDLE ? "FULL" : "STOP"); px->state == PR_STIDLE ? "FULL" : "STOP");
/* rest of server: nothing */
chunk_printf(&msg, sizeof(trash), "<td align=center colspan=5></td></tr>");
if (buffer_write_chunk(rep, &msg) != 0) if (buffer_write_chunk(rep, &msg) != 0)
return 0; return 0;
} }
@ -3108,34 +3099,25 @@ int produce_content_stats_proxy(struct session *s, struct proxy *px)
else else
sv_state = 0; /* DOWN */ sv_state = 0; /* DOWN */
chunk_printf(&msg, sizeof(trash),
/* name */ /* name */
chunk_printf(&msg, sizeof(trash), "<tr align=\"center\" class=\"%s%d\"><td>%s</td>"
"<tr align=\"center\" class=\"%s%d\"><td>%s</td>",
(sv->state & SRV_BACKUP) ? "active" : "backup",
sv_state, sv->id);
/* queue : current, max */ /* queue : current, max */
chunk_printf(&msg, sizeof(trash), "<td align=right>%d</td><td align=right>%d</td>"
"<td align=right>%d</td><td align=right>%d</td>",
sv->nbpend, sv->nbpend_max);
/* sessions : current, max, limit, cumul */ /* sessions : current, max, limit, cumul */
chunk_printf(&msg, sizeof(trash), "<td align=right>%d</td><td align=right>%d</td><td align=right>%s</td><td align=right>%d</td>"
"<td align=right>%d</td><td align=right>%d</td><td align=right>%s</td><td align=right>%d</td>",
sv->cur_sess, sv->cur_sess_max, sv->maxconn ? ultoa(sv->maxconn) : "-", sv->cum_sess);
/* bytes : in, out */ /* bytes : in, out */
chunk_printf(&msg, sizeof(trash), "<td align=right></td><td align=right></td>"
"<td align=right></td><td align=right></td>");
/* denied: req, resp */ /* denied: req, resp */
chunk_printf(&msg, sizeof(trash), "<td align=right></td><td align=right>%d</td>"
"<td align=right></td><td align=right>%d</td>",
sv->failed_secu);
/* errors : request, connect, response */ /* errors : request, connect, response */
chunk_printf(&msg, sizeof(trash), "<td align=right></td><td align=right>%d</td><td align=right>%d</td>\n"
"<td align=right></td><td align=right>%d</td><td align=right>%d</td>\n", "",
(sv->state & SRV_BACKUP) ? "active" : "backup",
sv_state, sv->id,
sv->nbpend, sv->nbpend_max,
sv->cur_sess, sv->cur_sess_max, sv->maxconn ? ultoa(sv->maxconn) : "-", sv->cum_sess,
sv->failed_secu,
sv->failed_conns, sv->failed_resp); sv->failed_conns, sv->failed_resp);
/* status */ /* status */
@ -3145,11 +3127,13 @@ int produce_content_stats_proxy(struct session *s, struct proxy *px)
(sv->state & SRV_RUNNING) ? (sv->health - sv->rise + 1) : (sv->health), (sv->state & SRV_RUNNING) ? (sv->health - sv->rise + 1) : (sv->health),
(sv->state & SRV_RUNNING) ? (sv->fall) : (sv->rise)); (sv->state & SRV_RUNNING) ? (sv->fall) : (sv->rise));
chunk_printf(&msg, sizeof(trash),
/* weight */ /* weight */
chunk_printf(&msg, sizeof(trash), "<td>%d</td>", sv->uweight+1); "</td><td>%d</td>"
/* act, bck */ /* act, bck */
chunk_printf(&msg, sizeof(trash), "<td>%s</td><td>%s</td>", "<td>%s</td><td>%s</td>"
"",
sv->uweight+1,
(sv->state & SRV_BACKUP) ? "-" : "Y", (sv->state & SRV_BACKUP) ? "-" : "Y",
(sv->state & SRV_BACKUP) ? "Y" : "-"); (sv->state & SRV_BACKUP) ? "Y" : "-");
@ -3174,48 +3158,35 @@ int produce_content_stats_proxy(struct session *s, struct proxy *px)
case DATA_ST_PX_BE: case DATA_ST_PX_BE:
/* print the backend */ /* print the backend */
if (px->cap & PR_CAP_BE) { if (px->cap & PR_CAP_BE) {
chunk_printf(&msg, sizeof(trash),
/* name */ /* name */
chunk_printf(&msg, sizeof(trash), "<tr align=center class=\"backend\"><td>Backend</td>"
"<tr align=center class=\"backend\"><td>Backend</td>");
/* queue : current, max */ /* queue : current, max */
chunk_printf(&msg, sizeof(trash), "<td align=right>%d</td><td align=right>%d</td>"
"<td align=right>%d</td><td align=right>%d</td>",
px->nbpend /* or px->totpend ? */, px->nbpend_max);
/* sessions : current, max, limit, cumul. */ /* sessions : current, max, limit, cumul. */
chunk_printf(&msg, sizeof(trash), "<td align=right>%d</td><td align=right>%d</td><td align=right>%d</td><td align=right>%d</td>"
"<td align=right>%d</td><td align=right>%d</td><td align=right>%d</td><td align=right>%d</td>",
px->beconn, px->beconn_max, px->fullconn, px->cum_beconn);
/* bytes : in, out */ /* bytes : in, out */
chunk_printf(&msg, sizeof(trash), "<td align=right></td><td align=right></td>"
"<td align=right></td><td align=right></td>");
/* denied: req, resp */ /* denied: req, resp */
chunk_printf(&msg, sizeof(trash), "<td align=right>%d</td><td align=right>%d</td>"
"<td align=right>%d</td><td align=right>%d</td>",
px->denied_req, px->denied_resp);
/* errors : request, connect, response */ /* errors : request, connect, response */
chunk_printf(&msg, sizeof(trash), "<td align=right></td><td align=right>%d</td><td align=right>%d</td>\n"
"<td align=right></td><td align=right>%d</td><td align=right>%d</td>\n",
px->failed_conns, px->failed_resp);
/* server status : reflect backend status (up/down) : we display UP /* server status : reflect backend status (up/down) : we display UP
* if the backend has known working servers or if it has no server at * if the backend has known working servers or if it has no server at
* all (eg: for stats). Tthen we display the total weight, number of * all (eg: for stats). Tthen we display the total weight, number of
* active and backups. */ * active and backups. */
chunk_printf(&msg, sizeof(trash), "<td align=center>%s</td><td align=center>%d</td>"
"<td align=center>%s</td>" "<td align=center>%d</td><td align=center>%d</td>"
"<td align=center>%d</td>" /* rest of server: nothing */
"<td align=center>%d</td><td align=center>%d</td>", "<td align=center colspan=2></td></tr>"
"",
px->nbpend /* or px->totpend ? */, px->nbpend_max,
px->beconn, px->beconn_max, px->fullconn, px->cum_beconn,
px->denied_req, px->denied_resp,
px->failed_conns, px->failed_resp,
(px->srv_map_sz > 0 || !px->srv) ? "UP" : "DOWN", (px->srv_map_sz > 0 || !px->srv) ? "UP" : "DOWN",
px->srv_map_sz, px->srv_act, px->srv_bck); px->srv_map_sz, px->srv_act, px->srv_bck);
/* rest of server: nothing */
chunk_printf(&msg, sizeof(trash), "<td align=center colspan=2></td></tr>");
if (buffer_write_chunk(rep, &msg) != 0) if (buffer_write_chunk(rep, &msg) != 0)
return 0; return 0;
} }