1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DEV: tcploop: add support for POLLRDHUP when supported

Browse Source 
This is just in order to closer match what haproxy does.
This commit is contained in:
Willy Tarreau 2022-11-25 16:15:20 +01:00
parent 45c2779456
commit e5f72b8754
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dev/tcploop/tcploop.c
View File

@ -24,6 +24,7 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#define _GNU_SOURCE // for POLLRDHUP
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/select.h> #include <sys/select.h>
#include <sys/types.h> #include <sys/types.h>
@ -50,6 +51,11 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
/* for OSes which don't have it */
#ifndef POLLRDHUP
#define POLLRDHUP 0
#endif
#ifndef MSG_MORE #ifndef MSG_MORE
#define MSG_MORE 0 #define MSG_MORE 0
#endif #endif
@ -299,7 +305,7 @@ int addr_to_ss(const char *str, struct sockaddr_storage *ss, struct err_msg *err
return 0; return 0;
} }
/* waits up to <ms> milliseconds on fd <fd> for events <events> (POLLIN|POLLOUT). /* waits up to <ms> milliseconds on fd <fd> for events <events> (POLLIN|POLLRDHUP|POLLOUT).
* returns poll's status, or -2 if the poller sets POLLERR. * returns poll's status, or -2 if the poller sets POLLERR.
*/ */
int wait_on_fd(int fd, int events, int ms) int wait_on_fd(int fd, int events, int ms)
@ -538,7 +544,7 @@ int tcp_recv(int sock, const char *arg)
dolog("recv %d\n", ret); dolog("recv %d\n", ret);
return -1; return -1;
} }
while (!wait_on_fd(sock, POLLIN, 1000)); while (!wait_on_fd(sock, POLLIN | POLLRDHUP, 1000));
continue; continue;
} }
dolog("recv %d\n", ret); dolog("recv %d\n", ret);
@ -636,7 +642,7 @@ int tcp_echo(int sock, const char *arg)
dolog("recv %d\n", rcvd); dolog("recv %d\n", rcvd);
return -1; return -1;
} }
while (!wait_on_fd(sock, POLLIN, 1000)); while (!wait_on_fd(sock, POLLIN | POLLRDHUP, 1000));
continue; continue;
} }
dolog("recv %d\n", rcvd); dolog("recv %d\n", rcvd);
@ -690,7 +696,7 @@ int tcp_wait(int sock, const char *arg)
} }
/* FIXME: this doesn't take into account delivered signals */ /* FIXME: this doesn't take into account delivered signals */
ret = wait_on_fd(sock, POLLIN | POLLOUT, delay); ret = wait_on_fd(sock, POLLIN | POLLRDHUP | POLLOUT, delay);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -702,7 +708,7 @@ int tcp_wait_in(int sock, const char *arg)
{ {
int ret; int ret;
ret = wait_on_fd(sock, POLLIN, 1000); ret = wait_on_fd(sock, POLLIN | POLLRDHUP, 1000);
if (ret < 0) if (ret < 0)
return ret; return ret;