[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20210114030949.54425-7-dsahern@kernel.org>
Date: Wed, 13 Jan 2021 20:09:42 -0700
From: David Ahern <dsahern@...nel.org>
To: netdev@...r.kernel.org
Cc: davem@...emloft.net, kuba@...nel.org, schoen@...alty.org,
David Ahern <dsahern@...il.com>
Subject: [PATCH net-next v4 06/13] selftests: Use separate stdout and stderr buffers in nettest
From: David Ahern <dsahern@...il.com>
When a single instance of nettest is doing both client and
server modes, stdout and stderr messages can get interlaced
and become unreadable. Allocate a new set of buffers for the
child process handling server mode.
Signed-off-by: David Ahern <dsahern@...il.com>
---
tools/testing/selftests/net/nettest.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/net/nettest.c b/tools/testing/selftests/net/nettest.c
index 685cbe8933de..aba3615ce977 100644
--- a/tools/testing/selftests/net/nettest.c
+++ b/tools/testing/selftests/net/nettest.c
@@ -1707,9 +1707,28 @@ static char *random_msg(int len)
static int ipc_child(int fd, struct sock_args *args)
{
+ char *outbuf, *errbuf;
+ int rc = 1;
+
+ outbuf = malloc(4096);
+ errbuf = malloc(4096);
+ if (!outbuf || !errbuf) {
+ fprintf(stderr, "server: Failed to allocate buffers for stdout and stderr\n");
+ goto out;
+ }
+
+ setbuffer(stdout, outbuf, 4096);
+ setbuffer(stderr, errbuf, 4096);
+
server_mode = 1; /* to tell log_msg in case we are in both_mode */
- return do_server(args, fd);
+ rc = do_server(args, fd);
+
+out:
+ free(outbuf);
+ free(errbuf);
+
+ return rc;
}
static int ipc_parent(int cpid, int fd, struct sock_args *args)
--
2.24.3 (Apple Git-128)
Powered by blists - more mailing lists