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

DEV: poll: indicate the FD's side in front of its value 

Some interleaved dumps were hard to follow. By indicating which side
we're talking about it's easier. E.g:

  $ dev/poll/poll -v -s pol,clo -c pol
  #### BEGIN ####
  cmd #1 stp #0: con(c=4): ret=0
  cmd #1 stp #0: acc(l=3): ret=5
  cmd #1 stp #1: pol(s=5): ret=1 ev=0x4 (OUT)
  cmd #1 stp #2: clo(s=5): ret=0
  cmd #2 stp #1: pol(c=4): ret=1 ev=0x2005 (IN OUT RDHUP)
This commit is contained in:
Willy Tarreau 2022-11-17 07:59:49 +01:00
parent 05ed7e849c
commit 35402852bd
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dev/poll/poll.c
View File

@ -36,6 +36,17 @@ int connected = 0;
struct sockaddr_in saddr, caddr; struct sockaddr_in saddr, caddr;
socklen_t salen, calen; socklen_t salen, calen;
static inline const char *side(int fd)
{
if (fd == lfd)
return "l";
if (fd == sfd)
return "s";
if (fd == cfd)
return "c";
return "?";
}
void usage(const char *arg0) void usage(const char *arg0)
{ {
printf("Usage: %s [ arg [<action>[,...]] ] ...\n" printf("Usage: %s [ arg [<action>[,...]] ] ...\n"
@ -89,7 +100,7 @@ void do_acc(int fd)
if (sfd < 0) if (sfd < 0)
sfd = ret; sfd = ret;
if (verbose) if (verbose)
printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); printf("cmd #%d stp #%d: %s(%s=%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, side(fd), fd, ret, get_errno(ret));
} }
void do_con(int fd) void do_con(int fd)
@ -98,7 +109,7 @@ void do_con(int fd)
ret = connect(cfd, (const struct sockaddr*)&saddr, salen); ret = connect(cfd, (const struct sockaddr*)&saddr, salen);
if (verbose) if (verbose)
printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); printf("cmd #%d stp #%d: %s(%s=%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, side(fd), fd, ret, get_errno(ret));
connected = 1; connected = 1;
} }
@ -108,7 +119,7 @@ void do_snd(int fd)
ret = send(fd, "foo", 3, MSG_NOSIGNAL|MSG_DONTWAIT); ret = send(fd, "foo", 3, MSG_NOSIGNAL|MSG_DONTWAIT);
if (verbose) if (verbose)
printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); printf("cmd #%d stp #%d: %s(%s=%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, side(fd), fd, ret, get_errno(ret));
} }
void do_mor(int fd) void do_mor(int fd)
@ -117,7 +128,7 @@ void do_mor(int fd)
ret = send(fd, "foo", 3, MSG_NOSIGNAL|MSG_DONTWAIT|MSG_MORE); ret = send(fd, "foo", 3, MSG_NOSIGNAL|MSG_DONTWAIT|MSG_MORE);
if (verbose) if (verbose)
printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); printf("cmd #%d stp #%d: %s(%s=%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, side(fd), fd, ret, get_errno(ret));
} }
void do_rcv(int fd) void do_rcv(int fd)
@ -127,7 +138,7 @@ void do_rcv(int fd)
ret = recv(fd, buf, sizeof(buf), MSG_DONTWAIT); ret = recv(fd, buf, sizeof(buf), MSG_DONTWAIT);
if (verbose) if (verbose)
printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); printf("cmd #%d stp #%d: %s(%s=%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, side(fd), fd, ret, get_errno(ret));
} }
void do_drn(int fd) void do_drn(int fd)
@ -146,7 +157,7 @@ void do_drn(int fd)
} }
if (verbose) if (verbose)
printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, total, get_errno(ret)); printf("cmd #%d stp #%d: %s(%s=%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, side(fd), fd, total, get_errno(ret));
} }
void do_shr(int fd) void do_shr(int fd)
@ -155,7 +166,7 @@ void do_shr(int fd)
ret = shutdown(fd, SHUT_RD); ret = shutdown(fd, SHUT_RD);
if (verbose) if (verbose)
printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); printf("cmd #%d stp #%d: %s(%s=%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, side(fd), fd, ret, get_errno(ret));
} }
void do_shw(int fd) void do_shw(int fd)
@ -164,7 +175,7 @@ void do_shw(int fd)
ret = shutdown(fd, SHUT_WR); ret = shutdown(fd, SHUT_WR);
if (verbose) if (verbose)
printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); printf("cmd #%d stp #%d: %s(%s=%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, side(fd), fd, ret, get_errno(ret));
} }
void do_shb(int fd) void do_shb(int fd)
@ -173,7 +184,7 @@ void do_shb(int fd)
ret = shutdown(fd, SHUT_RDWR); ret = shutdown(fd, SHUT_RDWR);
if (verbose) if (verbose)
printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); printf("cmd #%d stp #%d: %s(%s=%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, side(fd), fd, ret, get_errno(ret));
} }
void do_lin(int fd) void do_lin(int fd)
@ -183,7 +194,7 @@ void do_lin(int fd)
ret = setsockopt(fd, SOL_SOCKET, SO_LINGER, &nolinger, sizeof(nolinger)); ret = setsockopt(fd, SOL_SOCKET, SO_LINGER, &nolinger, sizeof(nolinger));
if (verbose) if (verbose)
printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); printf("cmd #%d stp #%d: %s(%s=%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, side(fd), fd, ret, get_errno(ret));
} }
void do_clo(int fd) void do_clo(int fd)
@ -192,7 +203,7 @@ void do_clo(int fd)
ret = close(fd); ret = close(fd);
if (verbose) if (verbose)
printf("cmd #%d stp #%d: %s(%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret)); printf("cmd #%d stp #%d: %s(%s=%d): ret=%d%s\n", cmd, cmdstep, __FUNCTION__ + 3, side(fd), fd, ret, get_errno(ret));
} }
void do_pol(int fd) void do_pol(int fd)
@ -202,7 +213,7 @@ void do_pol(int fd)
ret = poll(&fds, 1, 0); ret = poll(&fds, 1, 0);
if (verbose) { if (verbose) {
printf("cmd #%d stp #%d: %s(%d): ret=%d%s ev=%#x ", cmd, cmdstep, __FUNCTION__ + 3, fd, ret, get_errno(ret), ret > 0 ? fds.revents : 0); printf("cmd #%d stp #%d: %s(%s=%d): ret=%d%s ev=%#x ", cmd, cmdstep, __FUNCTION__ + 3, side(fd), fd, ret, get_errno(ret), ret > 0 ? fds.revents : 0);
if (ret > 0 && fds.revents) { if (ret > 0 && fds.revents) {
int flags, flag; int flags, flag;
putchar('('); putchar('(');