upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-05-25 18:52:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

to be merged: implement -e option

Browse source
This commit is contained in:
Frederic Lecaille 2026-05-21 20:30:25 +02:00
parent 2459ae5917
commit 4daa158974
3 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/haproxy/haload.h
View file

@ -57,6 +57,7 @@ extern int arg_mreqs;
extern int arg_reqs;
extern int arg_rcon;
extern int arg_slow;
extern int arg_serr;
extern int arg_usr;
extern int arg_nbthrds;
extern int arg_wait;

22
src/haload.c
View file

@ -85,6 +85,9 @@ struct hld_thr_info {
__attribute__((aligned(64))) union { } __pad;
};
/* User flags */
#define HLD_USR_FL_STOP 0x00000001 // this user must stop sending requests
struct hld_usr {
struct task *task;
struct session *sess;
@ -113,11 +116,13 @@ int arg_long; // long output format; 2=raw values
int arg_mreqs = 1; // max concurrent streams by connection
int arg_rcon = -1; // max requests per conn
int arg_reqs = -1; // max total requests
int arg_serr; // stop on first error
int arg_slow; // slow start: delay in milliseconds
int arg_nbthrds = -1; // number of threads
int arg_usr = 1; // number of users
int arg_wait = 10000; // I/O time out (ms)
int all_usr_stop_asap; // all users must stop as soon as possible
int conn_tid;
int usr_cnt; // user counter incremented by <mtask> main task
int running_usrs; // user counter decremented each time a user is released
@ -876,6 +881,7 @@ void update_throttle()
end:
throttle = ratio;
}
/* main task */
static struct task *mtask_cb(struct task *t, void *context, unsigned int state)
{
@ -915,7 +921,6 @@ static struct task *mtask_cb(struct task *t, void *context, unsigned int state)
ha_alert("could not allocate a new haload user\n");
break;
}
DDPRINTF(stderr, "U");
}
HA_ATOMIC_ADD(&running_usrs, nb_usr);
@ -1389,7 +1394,12 @@ static struct task *hld_strm_task(struct task *t, void *context, unsigned int st
LIST_DELETE(&hs->list);
hldstream_free(&hs);
t = NULL;
usr->nreqs = usr->nreqs == -1 ? -1 : usr->nreqs + 1;
if (arg_serr) {
usr->flags |= HLD_USR_FL_STOP;
HA_ATOMIC_STORE(&all_usr_stop_asap, 1);
}
else
usr->nreqs = usr->nreqs == -1 ? -1 : usr->nreqs + 1;
goto leave;
}
@ -1531,6 +1541,11 @@ static struct task *hld_usr_task(struct task *t, void *context, unsigned int sta
hldstream_free(&hs);
}
if ((usr->flags & HLD_USR_FL_STOP) || HA_ATOMIC_LOAD(&all_usr_stop_asap)) {
usr->flags |= HLD_USR_FL_STOP;
goto skip_new_strms;
}
for (url = urls; url; url = hld_next_url(urls, url)) {
struct hld_path *path, *paths = url->cfg->paths;
@ -1577,7 +1592,8 @@ static struct task *hld_usr_task(struct task *t, void *context, unsigned int sta
break;
}
if (!usr->nreqs && LIST_ISEMPTY(&usr->strms)) {
skip_new_strms:
if (((usr->flags & HLD_USR_FL_STOP) || !usr->nreqs) && LIST_ISEMPTY(&usr->strms)) {
HA_ATOMIC_DEC(&running_usrs);
hld_usr_release(&usr);
t = NULL;

7
src/haload_init.c
View file

@ -458,6 +458,13 @@ void haproxy_init_args(int argc, char **argv)
opt++;
hld_parse_long(&arg_dura, opt, &argc, &argv);
}
else if (*opt == 'e') {
/* empty option */
if (*(opt + 1))
hld_usage(progname, argc, __LINE__);
arg_serr = 1;
}
else if (*opt == 'l') {
arg_long++;
while (*++opt && *opt == 'l')