mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 07:37:02 +02:00
Code Issues Projects Releases Wiki Activity

[OPTIM] stats: check free space before trying to print

Browse Source 
This alone makes a typical HTML stats dump consume 10% CPU less,
because we avoid doing complex printf calls to drop them later.
Only a few common cases have been checked, those which are very
likely to run for nothing.
This commit is contained in:
Willy Tarreau 2009-10-11 23:35:10 +02:00
parent ea1f5fe28a
commit 4e33d8677a
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/proto/buffers.h
View File

@ -288,6 +288,14 @@ static inline int buffer_contig_space(struct buffer *buf)
return ret; return ret;
} }
/* Return 1 if the buffer has less than 1/4 of its capacity free, otherwise 0 */
static inline int buffer_almost_full(struct buffer *buf)
{
if (buffer_contig_space(buf) < buf->size / 4)
return 1;
return 0;
}
/* /*
* Return the max amount of bytes that can be read from the buffer at once. * Return the max amount of bytes that can be read from the buffer at once.
* Note that this may be lower than the actual buffer length when the data * Note that this may be lower than the actual buffer length when the data

15
src/dumpstats.c
View File

@ -540,6 +540,12 @@ void stats_io_handler(struct stream_interface *si)
break; break;
} }
else if (si->st0 == STAT_CLI_GETREQ) { else if (si->st0 == STAT_CLI_GETREQ) {
/* ensure we have some output room left in the event we
* would want to return some info right after parsing.
*/
if (buffer_almost_full(si->ib))
break;
reql = buffer_si_peekline(si->ob, trash, sizeof(trash)); reql = buffer_si_peekline(si->ob, trash, sizeof(trash));
if (reql <= 0) { /* closed or EOL not found */ if (reql <= 0) { /* closed or EOL not found */
if (reql == 0) if (reql == 0)
@ -1121,6 +1127,8 @@ int stats_dump_http(struct session *s, struct buffer *rep, struct uri_auth *uri)
case DATA_ST_LIST: case DATA_ST_LIST:
/* dump proxies */ /* dump proxies */
while (s->data_ctx.stats.px) { while (s->data_ctx.stats.px) {
if (buffer_almost_full(rep))
return 0;
px = s->data_ctx.stats.px; px = s->data_ctx.stats.px;
/* skip the disabled proxies and non-networked ones */ /* skip the disabled proxies and non-networked ones */
if (px->state != PR_STSTOPPED && (px->cap & (PR_CAP_FE | PR_CAP_BE))) if (px->state != PR_STSTOPPED && (px->cap & (PR_CAP_FE | PR_CAP_BE)))
@ -1329,6 +1337,9 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri)
case DATA_ST_PX_LI: case DATA_ST_PX_LI:
/* stats.l has been initialized above */ /* stats.l has been initialized above */
for (; s->data_ctx.stats.l != NULL; s->data_ctx.stats.l = l->next) { for (; s->data_ctx.stats.l != NULL; s->data_ctx.stats.l = l->next) {
if (buffer_almost_full(rep))
return 0;
l = s->data_ctx.stats.l; l = s->data_ctx.stats.l;
if (!l->counters) if (!l->counters)
continue; continue;
@ -1418,9 +1429,11 @@ int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri)
case DATA_ST_PX_SV: case DATA_ST_PX_SV:
/* stats.sv has been initialized above */ /* stats.sv has been initialized above */
for (; s->data_ctx.stats.sv != NULL; s->data_ctx.stats.sv = sv->next) { for (; s->data_ctx.stats.sv != NULL; s->data_ctx.stats.sv = sv->next) {
int sv_state; /* 0=DOWN, 1=going up, 2=going down, 3=UP, 4,5=NOLB, 6=unchecked */ int sv_state; /* 0=DOWN, 1=going up, 2=going down, 3=UP, 4,5=NOLB, 6=unchecked */
if (buffer_almost_full(rep))
return 0;
sv = s->data_ctx.stats.sv; sv = s->data_ctx.stats.sv;
if (s->data_ctx.stats.flags & STAT_BOUND) { if (s->data_ctx.stats.flags & STAT_BOUND) {