CLEANUP: listener/thread: remove now unused bind_conf's bind_tgroup/bind_thread
Not needed anymore since last commit, let's get rid of it.
diff --git a/include/haproxy/listener-t.h b/include/haproxy/listener-t.h
index 90a67b2..899c849 100644
--- a/include/haproxy/listener-t.h
+++ b/include/haproxy/listener-t.h
@@ -205,8 +205,6 @@
int line; /* line where the section appears */
__decl_thread(HA_RWLOCK_T sni_lock); /* lock the SNI trees during add/del operations */
struct thread_set thread_set; /* entire set of the allowed threads (0=no restriction) */
- unsigned long bind_thread; /* bitmask of threads allowed on this bind_conf */
- uint bind_tgroup; /* thread group ID: 0=global IDs, non-zero=local IDs */
struct rx_settings settings; /* all the settings needed for the listening socket */
};
diff --git a/include/haproxy/thread.h b/include/haproxy/thread.h
index 068e6e8..6590706 100644
--- a/include/haproxy/thread.h
+++ b/include/haproxy/thread.h
@@ -44,7 +44,7 @@
void ha_tkillall(int sig);
void ha_thread_relax(void);
int thread_map_to_groups();
-int thread_resolve_group_mask(struct thread_set *ts, int defgrp, uint *ogid, ulong *omask, char **err);
+int thread_resolve_group_mask(struct thread_set *ts, int defgrp, char **err);
int parse_thread_set(const char *arg, struct thread_set *ts, char **err);
extern int thread_cpus_enabled_at_boot;
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 659f239..75d0b56 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -2954,8 +2954,7 @@
/* detect and address thread affinity inconsistencies */
err = NULL;
- if (thread_resolve_group_mask(&bind_conf->thread_set, 1,
- &bind_conf->bind_tgroup, &bind_conf->bind_thread, &err) < 0) {
+ if (thread_resolve_group_mask(&bind_conf->thread_set, (curproxy == global.cli_fe) ? 1 : 0, &err) < 0) {
ha_alert("Proxy '%s': %s in 'bind %s' at [%s:%d].\n",
curproxy->id, err, bind_conf->arg, bind_conf->file, bind_conf->line);
free(err);
@@ -4436,8 +4435,7 @@
}
err = NULL;
- if (thread_resolve_group_mask(&bind_conf->thread_set, (curproxy == global.cli_fe) ? 1 : 0,
- &bind_conf->bind_tgroup, &bind_conf->bind_thread, &err) < 0) {
+ if (thread_resolve_group_mask(&bind_conf->thread_set, 1, &err) < 0) {
ha_alert("Peers section '%s': %s in 'bind %s' at [%s:%d].\n",
curpeers->peers_fe->id, err, bind_conf->arg, bind_conf->file, bind_conf->line);
free(err);
diff --git a/src/thread.c b/src/thread.c
index 75ce24a..94d150d 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -1228,13 +1228,11 @@
* was completed and the thread group numbers configured. The thread_set is
* replaced by the resolved group-based one. It is possible to force a single
* default group for unspecified sets instead of enabling all groups by passing
- * this group's non-zero value to defgrp. The output ogid and omask are set,
- * respectively, to the first non-empty group and its mask. They're used only
- * for the transition to the new model.
+ * this group's non-zero value to defgrp.
*
* Returns <0 on failure, >=0 on success.
*/
-int thread_resolve_group_mask(struct thread_set *ts, int defgrp, uint *ogid, ulong *omask, char **err)
+int thread_resolve_group_mask(struct thread_set *ts, int defgrp, char **err)
{
struct thread_set new_ts = { 0 };
ulong mask, imask;
@@ -1319,10 +1317,6 @@
}
*ts = new_ts;
-
- /* FIXME: for now we still also return the old format */
- *ogid = thread_set_first_group(ts);
- *omask = thread_set_first_tmask(ts);
return 0;
}