mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: listeners: move fd_stop_recv() to the receiver's socket code

Browse Source 
fd_stop_recv() has nothing to do in the generic listener code, it's per
protocol as some don't need it. For instance with abns@ it could even
lead to fd_stop_recv(-1). And later with QUIC we don't want to touch
the fd at all! It used to be that since commit f2cb169487 delegating
fd manipulation to their respective threads it wasn't possible to call
it down there but it's not the case anymore, so let's perform the action
in the protocol-specific code.
This commit is contained in:
Willy Tarreau 2020-09-24 18:20:37 +02:00
parent fb76bd5ca6
commit e53608b2cd
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/listener.c
View File

@ -362,7 +362,6 @@ int pause_listener(struct listener *l)
MT_LIST_DEL(&l->wait_queue); MT_LIST_DEL(&l->wait_queue);
fd_stop_recv(l->rx.fd);
listener_set_state(l, LI_PAUSED); listener_set_state(l, LI_PAUSED);
if (px && !px->li_ready) { if (px && !px->li_ready) {

9
src/proto_tcp.c
View File

@ -743,6 +743,7 @@ int tcp_pause_listener(struct listener *l)
if (shutdown(l->rx.fd, SHUT_RD) != 0) if (shutdown(l->rx.fd, SHUT_RD) != 0)
goto check_already_done; /* show always be OK */ goto check_already_done; /* show always be OK */
fd_stop_recv(l->rx.fd);
return 1; return 1;
check_already_done: check_already_done:
@ -752,11 +753,15 @@ int tcp_pause_listener(struct listener *l)
*/ */
opt_val = 0; opt_val = 0;
opt_len = sizeof(opt_val); opt_len = sizeof(opt_val);
if (getsockopt(l->rx.fd, SOL_SOCKET, SO_ACCEPTCONN, &opt_val, &opt_len) == -1) if (getsockopt(l->rx.fd, SOL_SOCKET, SO_ACCEPTCONN, &opt_val, &opt_len) == -1) {
fd_stop_recv(l->rx.fd);
return 0; /* the socket is really unrecoverable */ return 0; /* the socket is really unrecoverable */
}
if (!opt_val) if (!opt_val) {
fd_stop_recv(l->rx.fd);
return 1; /* already paused by another process */ return 1; /* already paused by another process */
}
/* something looks fishy here */ /* something looks fishy here */
return -1; return -1;

3
src/proto_uxst.c
View File

@ -151,7 +151,8 @@ static void uxst_add_listener(struct listener *listener, int port)
/* Pause a listener. Returns < 0 in case of failure, 0 if the listener /* Pause a listener. Returns < 0 in case of failure, 0 if the listener
* was totally stopped, or > 0 if correctly paused. Nothing is done for * was totally stopped, or > 0 if correctly paused. Nothing is done for
* plain unix sockets since currently it's the new process which handles * plain unix sockets since currently it's the new process which handles
* the renaming. Abstract sockets are completely unbound. * the renaming. Abstract sockets are completely unbound and closed so
* there's no need to stop the poller.
*/ */
static int uxst_pause_listener(struct listener *l) static int uxst_pause_listener(struct listener *l)
{ {