RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: listener/config: remove the special case for shards==1 

In fact this case is already handled by the regular shards code, there
is no need to special-case it.
This commit is contained in:
Willy Tarreau 2023-02-03 14:53:34 +01:00
parent f2988e1447
commit 484093df80
1 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/cfgparse.c
View File

@ -2968,52 +2968,47 @@ int check_config_validity()
/* apply thread masks and groups to all receivers */
list_for_each_entry(li, &bind_conf->listeners, by_bind) {
if (bind_conf->settings.shards <= 1) {
li->rx.bind_thread = thread_set_first_tmask(&bind_conf->thread_set);
li->rx.bind_tgroup = thread_set_first_group(&bind_conf->thread_set);
} else {
struct listener *new_li;
int shard, shards, todo, done, bit;
ulong mask;
struct listener *new_li;
int shard, shards, todo, done, bit;
ulong mask;
shards = bind_conf->settings.shards;
todo = my_popcountl(thread_set_first_tmask(&bind_conf->thread_set));
shards = bind_conf->settings.shards;
todo = my_popcountl(thread_set_first_tmask(&bind_conf->thread_set));
/* no more shards than total threads */
if (shards > todo)
shards = todo;
/* no more shards than total threads */
if (shards > todo)
shards = todo;
shard = done = bit = 0;
new_li = li;
shard = done = bit = 0;
new_li = li;
while (1) {
mask = 0;
while (done < todo) {
/* enlarge mask to cover next bit of bind_thread */
while (!(thread_set_first_tmask(&bind_conf->thread_set) & (1UL << bit)))
bit++;
mask |= (1UL << bit);
while (1) {
mask = 0;
while (done < todo) {
/* enlarge mask to cover next bit of bind_thread */
while (!(thread_set_first_tmask(&bind_conf->thread_set) & (1UL << bit)))
bit++;
done += shards;
}
mask |= (1UL << bit);
bit++;
done += shards;
}
new_li->rx.bind_thread = thread_set_first_tmask(&bind_conf->thread_set) & mask;
new_li->rx.bind_tgroup = thread_set_first_group(&bind_conf->thread_set);
done -= todo;
new_li->rx.bind_thread = thread_set_first_tmask(&bind_conf->thread_set) & mask;
new_li->rx.bind_tgroup = thread_set_first_group(&bind_conf->thread_set);
done -= todo;
shard++;
if (shard >= shards)
break;
shard++;
if (shard >= shards)
break;
/* create another listener for new shards */
new_li = clone_listener(li);
if (!new_li) {
ha_alert("Out of memory while trying to allocate extra listener for shard %d in %s %s\n",
shard, proxy_type_str(curproxy), curproxy->id);
cfgerr++;
err_code |= ERR_FATAL | ERR_ALERT;
goto out;
}
/* create another listener for new shards */
new_li = clone_listener(li);
if (!new_li) {
ha_alert("Out of memory while trying to allocate extra listener for shard %d in %s %s\n",
shard, proxy_type_str(curproxy), curproxy->id);
cfgerr++;
err_code |= ERR_FATAL | ERR_ALERT;
goto out;
}
}
}