RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-25 06:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: cli/fd: don't isolate the thread for each individual fd

Browse Source 
It takes ages to proceed with "show fd" when there is sustained activity
because it uses the rendez-vous point for each and every file descriptor
in the loop. It's very common to see socat timeout there.

Instead of doing this, let's just isolate the function when entering the
loop. Its duration is limited by the number of FDs that may be emitted in
a single buffer anyway, so it's much lighter and responds much faster.
This commit is contained in:
Willy Tarreau 2018-12-18 15:45:11 +01:00
parent 3af3771bf3
commit ca1b15743f
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/cli.c
View File

@ -865,12 +865,18 @@ static int cli_io_handler_show_fd(struct appctx *appctx)
{
struct stream_interface *si = appctx->owner;
int fd = appctx->ctx.cli.i0;
int ret = 1;
if (unlikely(si_ic(si)->flags & (CF_WRITE_ERROR|CF_SHUTW)))
return 1;
goto end;
chunk_reset(&trash);
/* isolate the threads once per round. We're limited to a buffer worth
* of output anyway, it cannot last very long.
*/
thread_isolate();
/* we have two inner loops here, one for the proxy, the other one for
* the buffer.
*/
@ -883,14 +889,10 @@ static int cli_io_handler_show_fd(struct appctx *appctx)
void *ctx = NULL;
uint32_t conn_flags = 0;
thread_isolate();
fdt = fdtab[fd];
if (!fdt.owner) {
thread_release();
if (!fdt.owner)
goto skip; // closed
}
if (fdt.iocb == conn_fd_handler) {
conn_flags = ((struct connection *)fdt.owner)->flags;
@ -956,24 +958,26 @@ static int cli_io_handler_show_fd(struct appctx *appctx)
li->bind_conf->frontend->id);
}
thread_release();
chunk_appendf(&trash, "\n");
if (ci_putchk(si_ic(si), &trash) == -1) {
si_rx_room_blk(si);
return 0;
appctx->ctx.cli.i0 = fd;
ret = 0;
break;
}
skip:
if (appctx->st2 == STAT_ST_END)
break;
fd++;
appctx->ctx.cli.i0 = fd;
}
end:
/* dump complete */
return 1;
thread_release();
return ret;
}
/* This function dumps some activity counters used by developers and support to