mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 14:50:59 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: listener: remove the now unused options field

Browse Source 
All options that made sense were moved to the bind_conf, and remaining
ones were removed. This field isn't used at all anymore. The thr_idx
field was moved there to plug the hole.
This commit is contained in:
Willy Tarreau 2023-01-12 20:10:11 +01:00
parent 4c1d3a953d
commit b25634d23e
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/haproxy/listener-t.h
View File

@ -90,25 +90,6 @@ enum li_status {
LI_STATE_COUNT /* must be last */ LI_STATE_COUNT /* must be last */
}; };
/* listener socket options */
#define LI_O_NONE 0x0000
/* unused 0x0001 */
/* unused 0x0002 */
/* unused 0x0004 */
/* unused 0x0008 */
/* unused 0x0010 */
/* unused 0x0020 */
/* unused 0x0040 */
/* unused 0x0080 */
/* unused 0x0100 */
/* unused 0x0200 */
/* unused 0x0400 */
/* unused 0x0800 */
/* unused 0x1000 */
/* unused 0x2000 */
/* unused 0x4000 */
/* unused 0x8000 */
/* Note: if a bind_conf uses BC_O_UNLIMITED, it is highly recommended that it adds its own /* Note: if a bind_conf uses BC_O_UNLIMITED, it is highly recommended that it adds its own
* maxconn setting to the global.maxsock value so that its resources are reserved. * maxconn setting to the global.maxsock value so that its resources are reserved.
*/ */
@ -249,22 +230,17 @@ struct listener {
enum li_state state; /* state: NEW, INIT, ASSIGNED, LISTEN, READY, FULL */ enum li_state state; /* state: NEW, INIT, ASSIGNED, LISTEN, READY, FULL */
/* 2-byte hole here */ /* 2-byte hole here */
int luid; /* listener universally unique ID, used for SNMP */ int luid; /* listener universally unique ID, used for SNMP */
int options; /* socket options : LI_O_* */
int flags; /* LI_F_* flags */ int flags; /* LI_F_* flags */
unsigned int thr_idx; /* thread indexes for queue distribution : (t2<<16)+t1 */
__decl_thread(HA_RWLOCK_T lock); __decl_thread(HA_RWLOCK_T lock);
struct fe_counters *counters; /* statistics counters */ struct fe_counters *counters; /* statistics counters */
int nbconn; /* current number of connections on this listener */ int nbconn; /* current number of connections on this listener */
/* cache line boundary */
struct mt_list wait_queue; /* link element to make the listener wait for something (LI_LIMITED) */ struct mt_list wait_queue; /* link element to make the listener wait for something (LI_LIMITED) */
unsigned int thr_idx; /* thread indexes for queue distribution : (t2<<16)+t1 */
char *name; /* listener's name */ char *name; /* listener's name */
/* cache line boundary */
unsigned int thr_conn[MAX_THREADS]; /* number of connections per thread */ unsigned int thr_conn[MAX_THREADS]; /* number of connections per thread */
/* cache line boundary */
struct list by_fe; /* chaining in frontend's list of listeners */ struct list by_fe; /* chaining in frontend's list of listeners */
struct list by_bind; /* chaining in bind_conf's list of listeners */ struct list by_bind; /* chaining in bind_conf's list of listeners */
struct bind_conf *bind_conf; /* "bind" line settings, include SSL settings among other things */ struct bind_conf *bind_conf; /* "bind" line settings, include SSL settings among other things */