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

REORG: mworker: declare master variable in global.h 

This variable is used at several places, better declare it in global.h.
This commit is contained in:
William Lallemand 2018-11-27 12:02:38 +01:00 committed by Willy Tarreau
parent c03eb01c1a
commit 4b58c80ee2
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types/global.h
View File

@ -219,6 +219,7 @@ extern unsigned int warned; /* bitfield of a few warnings to emit just once
extern volatile unsigned long sleeping_thread_mask; extern volatile unsigned long sleeping_thread_mask;
extern struct list proc_list; /* list of process in mworker mode */ extern struct list proc_list; /* list of process in mworker mode */
extern struct mworker_proc *proc_self; /* process structure of current process */ extern struct mworker_proc *proc_self; /* process structure of current process */
extern int master; /* 1 if in master, 0 otherwise */
/* bit values to go with "warned" above */ /* bit values to go with "warned" above */
#define WARN_BLOCK_DEPRECATED 0x00000001 #define WARN_BLOCK_DEPRECATED 0x00000001

2
src/cli.c
View File

@ -95,8 +95,6 @@ static struct cli_kw_list cli_keywords = {
extern const char *stat_status_codes[]; extern const char *stat_status_codes[];
extern int master;
static struct proxy *mworker_proxy; /* CLI proxy of the master */ static struct proxy *mworker_proxy; /* CLI proxy of the master */
static char *cli_gen_usage_msg(struct appctx *appctx) static char *cli_gen_usage_msg(struct appctx *appctx)

2
src/listener.c
View File

@ -50,8 +50,6 @@ static struct bind_kw_list bind_keywords = {
.list = LIST_HEAD_INIT(bind_keywords.list) .list = LIST_HEAD_INIT(bind_keywords.list)
}; };
extern int master;
struct xfer_sock_list *xfer_sock_list = NULL; struct xfer_sock_list *xfer_sock_list = NULL;
/* This function adds the specified listener's file descriptor to the polling /* This function adds the specified listener's file descriptor to the polling