mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-24 07:11:20 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: listeners: remove unused disable_listener and disable_all_listeners

Browse Source 
These ones have never been called, they were referenced by the protocol's
disable_all for some protocols but there are no traces of their use, so
in addition to not being sure the code works, it has never been tested.
Let's remove a bit of complexity starting from there.
This commit is contained in:
Willy Tarreau 2020-09-25 16:31:30 +02:00
parent fb4ead8e8a
commit d008009958
2 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/haproxy/listener.h
View File

@ -56,13 +56,6 @@ int resume_listener(struct listener *l);
*/ */
int enable_all_listeners(struct protocol *proto); int enable_all_listeners(struct protocol *proto);
/* This function removes all of the protocol's listener's file descriptors from
* the polling lists when they are in the LI_READY or LI_FULL states. It is
* intended to be used as a protocol's generic disable_all() primitive. It puts
* the listeners into LI_LISTEN, and always returns ERR_NONE.
*/
int disable_all_listeners(struct protocol *proto);
/* Dequeues all listeners waiting for a resource the global wait queue */ /* Dequeues all listeners waiting for a resource the global wait queue */
void dequeue_all_listeners(); void dequeue_all_listeners();

34
src/listener.c
View File

@ -309,23 +309,6 @@ static void enable_listener(struct listener *listener)
HA_SPIN_UNLOCK(LISTENER_LOCK, &listener->lock); HA_SPIN_UNLOCK(LISTENER_LOCK, &listener->lock);
} }
/* This function removes the specified listener's file descriptor from the
* polling lists if it is in the LI_READY or in the LI_FULL state. The listener
* enters LI_LISTEN.
*/
static void disable_listener(struct listener *listener)
{
HA_SPIN_LOCK(LISTENER_LOCK, &listener->lock);
if (listener->state < LI_READY)
goto end;
if (listener->state == LI_READY)
fd_stop_recv(listener->rx.fd);
MT_LIST_DEL(&listener->wait_queue);
listener_set_state(listener, LI_LISTEN);
end:
HA_SPIN_UNLOCK(LISTENER_LOCK, &listener->lock);
}
/* This function tries to temporarily disable a listener, depending on the OS /* This function tries to temporarily disable a listener, depending on the OS
* capabilities. Linux unbinds the listen socket after a SHUT_RD, and ignores * capabilities. Linux unbinds the listen socket after a SHUT_RD, and ignores
* SHUT_WR. Solaris refuses either shutdown(). OpenBSD ignores SHUT_RD but * SHUT_WR. Solaris refuses either shutdown(). OpenBSD ignores SHUT_RD but
@ -498,23 +481,6 @@ int enable_all_listeners(struct protocol *proto)
return ERR_NONE; return ERR_NONE;
} }
/* This function removes all of the protocol's listener's file descriptors from
* the polling lists when they are in the LI_READY or LI_FULL states. It is
* intended to be used as a protocol's generic disable_all() primitive. It puts
* the listeners into LI_LISTEN, and always returns ERR_NONE.
*
* Must be called with proto_lock held.
*
*/
int disable_all_listeners(struct protocol *proto)
{
struct listener *listener;
list_for_each_entry(listener, &proto->listeners, rx.proto_list)
disable_listener(listener);
return ERR_NONE;
}
/* Dequeues all listeners waiting for a resource the global wait queue */ /* Dequeues all listeners waiting for a resource the global wait queue */
void dequeue_all_listeners() void dequeue_all_listeners()
{ {