MINOR: listeners: move the LI_O_MWORKER flag to the receiver
This listener flag indicates whether the receiver part of the listener
is specific to the master or to the workers. In practice it's only used
by the master's CLI right now. It's used to know whether or not the FD
must be closed before forking the workers. For this reason it's way more
of a receiver's property than a listener's property, so let's move it
there under the name RX_F_MWORKER. The rest of the code remains
unchanged.
diff --git a/src/listener.c b/src/listener.c
index 94db957..d28b8da 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -287,10 +287,8 @@
* the workers. Conversely, if it's supposed to be only in the workers
* close it in the master.
*/
- if ((master && !(listener->options & LI_O_MWORKER)) ||
- (!master && (listener->options & LI_O_MWORKER))) {
+ if (!!master != !!(listener->rx.flags & RX_F_MWORKER))
do_unbind_listener(listener);
- }
if (listener->state == LI_LISTEN) {
BUG_ON(listener->rx.fd == -1);
@@ -579,12 +577,12 @@
*/
if (!stopping && !master &&
- !(listener->options & LI_O_MWORKER) &&
+ !(listener->rx.flags & RX_F_MWORKER) &&
(global.tune.options & GTUNE_SOCKET_TRANSFER))
return;
if (!stopping && master &&
- listener->options & LI_O_MWORKER &&
+ listener->rx.flags & RX_F_MWORKER &&
listener->rx.flags & RX_F_INHERITED)
return;