mirror of
https://github.com/haproxy/haproxy.git
synced 2026-05-27 03:33:36 -04:00
MINOR: haterm: Don't init haterm master pipe if not used
There is no reason to initialize the haterm master pipe if haterm is not used. So now, it is only performed if a non-disabled haterm frontend is found. To do so, in addition to test the proxy's flags and capabilities, we also check if "stream_new_from_sc" points on "hstream_new".
This commit is contained in:
parent
b74b5289c8
commit
1279bd80e9
1 changed files with 12 additions and 1 deletions
13
src/haterm.c
13
src/haterm.c
|
|
@ -12,7 +12,7 @@
|
|||
#include <haproxy/istbuf.h>
|
||||
#include <haproxy/pipe.h>
|
||||
#include <haproxy/pool.h>
|
||||
#include <haproxy/proxy-t.h>
|
||||
#include <haproxy/proxy.h>
|
||||
#include <haproxy/sc_strm.h>
|
||||
#include <haproxy/stconn-t.h>
|
||||
#include <haproxy/stream.h>
|
||||
|
|
@ -1223,11 +1223,22 @@ static int hstream_build_responses(void)
|
|||
#if defined(USE_LINUX_SPLICE)
|
||||
static void hstream_init_splicing(void)
|
||||
{
|
||||
struct proxy *px;
|
||||
unsigned int pipesize = 65536;
|
||||
int haterm_used = 0;
|
||||
|
||||
if (!(global.tune.options & GTUNE_USE_SPLICE) || !global.maxpipes)
|
||||
return;
|
||||
|
||||
for (px = proxies_list; px; px = px->next) {
|
||||
if ((px->cap & PR_CAP_FE) && !(px->flags & PR_FL_DISABLED) && px->stream_new_from_sc == hstream_new) {
|
||||
haterm_used = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!haterm_used)
|
||||
return;
|
||||
|
||||
if (global.tune.pipesize)
|
||||
pipesize = global.tune.pipesize;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue