RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-02 01:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: use an int instead of calling tcpcheck_get_step_id

Browse Source 
in src.checks.c, the function tcpcheck_get_step_id is called many times.
In order to save some cpu cycles, I save the result of this function in
an integer.
This commit is contained in:
Baptiste Assmann 2015-05-02 09:00:23 +02:00 committed by Willy Tarreau
parent 96a5c9b577
commit cfbd1b8605
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/checks.c
View File

@ -2386,7 +2386,7 @@ static void tcpcheck_main(struct connection *conn)
{ {
char *contentptr; char *contentptr;
struct tcpcheck_rule *cur, *next; struct tcpcheck_rule *cur, *next;
int done = 0, ret = 0; int done = 0, ret = 0, step = 0;
struct check *check = conn->owner; struct check *check = conn->owner;
struct server *s = check->server; struct server *s = check->server;
struct task *t = check->task; struct task *t = check->task;
@ -2569,15 +2569,16 @@ static void tcpcheck_main(struct connection *conn)
break; break;
case SF_ERR_SRVTO: /* ETIMEDOUT */ case SF_ERR_SRVTO: /* ETIMEDOUT */
case SF_ERR_SRVCL: /* ECONNREFUSED, ENETUNREACH, ... */ case SF_ERR_SRVCL: /* ECONNREFUSED, ENETUNREACH, ... */
step = tcpcheck_get_step_id(check);
chunk_printf(&trash, "TCPCHK error establishing connection at step %d: %s", chunk_printf(&trash, "TCPCHK error establishing connection at step %d: %s",
tcpcheck_get_step_id(check), strerror(errno)); step, strerror(errno));
set_server_check_status(check, HCHK_STATUS_L4CON, trash.str); set_server_check_status(check, HCHK_STATUS_L4CON, trash.str);
goto out_end_tcpcheck; goto out_end_tcpcheck;
case SF_ERR_PRXCOND: case SF_ERR_PRXCOND:
case SF_ERR_RESOURCE: case SF_ERR_RESOURCE:
case SF_ERR_INTERNAL: case SF_ERR_INTERNAL:
chunk_printf(&trash, "TCPCHK error establishing connection at step %d", step = tcpcheck_get_step_id(check);
tcpcheck_get_step_id(check)); chunk_printf(&trash, "TCPCHK error establishing connection at step %d", step);
set_server_check_status(check, HCHK_STATUS_SOCKERR, trash.str); set_server_check_status(check, HCHK_STATUS_SOCKERR, trash.str);
goto out_end_tcpcheck; goto out_end_tcpcheck;
} }
@ -2685,8 +2686,8 @@ static void tcpcheck_main(struct connection *conn)
continue; continue;
/* empty response */ /* empty response */
chunk_printf(&trash, "TCPCHK got an empty response at step %d", step = tcpcheck_get_step_id(check);
tcpcheck_get_step_id(check)); chunk_printf(&trash, "TCPCHK got an empty response at step %d", step);
set_server_check_status(check, HCHK_STATUS_L7RSP, trash.str); set_server_check_status(check, HCHK_STATUS_L7RSP, trash.str);
goto out_end_tcpcheck; goto out_end_tcpcheck;
@ -2705,18 +2706,18 @@ static void tcpcheck_main(struct connection *conn)
continue; /* try to read more */ continue; /* try to read more */
/* matched */ /* matched */
step = tcpcheck_get_step_id(check);
if (ret) { if (ret) {
/* matched but we did not want to => ERROR */ /* matched but we did not want to => ERROR */
if (cur->inverse) { if (cur->inverse) {
/* we were looking for a string */ /* we were looking for a string */
if (cur->string != NULL) { if (cur->string != NULL) {
chunk_printf(&trash, "TCPCHK matched unwanted content '%s' at step %d", chunk_printf(&trash, "TCPCHK matched unwanted content '%s' at step %d",
cur->string, tcpcheck_get_step_id(check)); cur->string, step);
} }
else { else {
/* we were looking for a regex */ /* we were looking for a regex */
chunk_printf(&trash, "TCPCHK matched unwanted content (regex) at step %d", chunk_printf(&trash, "TCPCHK matched unwanted content (regex) at step %d", step);
tcpcheck_get_step_id(check));
} }
set_server_check_status(check, HCHK_STATUS_L7RSP, trash.str); set_server_check_status(check, HCHK_STATUS_L7RSP, trash.str);
goto out_end_tcpcheck; goto out_end_tcpcheck;
@ -2745,12 +2746,12 @@ static void tcpcheck_main(struct connection *conn)
/* we were looking for a string */ /* we were looking for a string */
if (cur->string != NULL) { if (cur->string != NULL) {
chunk_printf(&trash, "TCPCHK did not match content '%s' at step %d", chunk_printf(&trash, "TCPCHK did not match content '%s' at step %d",
cur->string, tcpcheck_get_step_id(check)); cur->string, step);
} }
else { else {
/* we were looking for a regex */ /* we were looking for a regex */
chunk_printf(&trash, "TCPCHK did not match content (regex) at step %d", chunk_printf(&trash, "TCPCHK did not match content (regex) at step %d",
tcpcheck_get_step_id(check)); step);
} }
set_server_check_status(check, HCHK_STATUS_L7RSP, trash.str); set_server_check_status(check, HCHK_STATUS_L7RSP, trash.str);
goto out_end_tcpcheck; goto out_end_tcpcheck;