All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Ahern <dsahern@kernel.org>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, schoen@loyalty.org,
	David Ahern <dsahern@gmail.com>
Subject: [PATCH 06/11] selftests: Use separate stdout and stderr buffers in nettest
Date: Sat,  9 Jan 2021 11:53:53 -0700	[thread overview]
Message-ID: <20210109185358.34616-7-dsahern@kernel.org> (raw)
In-Reply-To: <20210109185358.34616-1-dsahern@kernel.org>

From: David Ahern <dsahern@gmail.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@gmail.com>
---
 tools/testing/selftests/net/nettest.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/net/nettest.c b/tools/testing/selftests/net/nettest.c
index 176709eb8b16..ab3e268c12a9 100644
--- a/tools/testing/selftests/net/nettest.c
+++ b/tools/testing/selftests/net/nettest.c
@@ -1705,9 +1705,27 @@ static char *random_msg(int len)
 
 static int ipc_child(int fd, struct sock_args *args)
 {
+	char *outbuf, *errbuf;
+	int rc;
+
+	outbuf = malloc(4096);
+	errbuf = malloc(4096);
+	if (!outbuf || !errbuf) {
+		fprintf(stderr, "server: Failed to allocate buffers for stdout and stderr\n");
+		return 1;
+	}
+
+	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);
+
+	free(outbuf);
+	free(errbuf);
+
+	return rc;
 }
 
 static int ipc_parent(int cpid, int fd, struct sock_args *args)
-- 
2.24.3 (Apple Git-128)


  parent reply	other threads:[~2021-01-09 18:55 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-09 18:53 [PATCH 00/11] selftests: Updates to allow single instance of nettest for client and server David Ahern
2021-01-09 18:53 ` [PATCH 01/11] selftests: Move device validation in nettest David Ahern
2021-01-09 18:53 ` [PATCH 02/11] selftests: Move convert_addr up " David Ahern
2021-01-09 18:53 ` [PATCH 03/11] selftests: Move address validation " David Ahern
2021-01-09 18:53 ` [PATCH 04/11] selftests: Add options to set network namespace to nettest David Ahern
2021-01-09 18:53 ` [PATCH 05/11] selftests: Add support to nettest to run both client and server David Ahern
2021-01-09 18:53 ` David Ahern [this message]
2021-01-09 18:53 ` [PATCH 07/11] selftests: Add missing newline in nettest error messages David Ahern
2021-01-09 18:53 ` [PATCH 08/11] selftests: Make address validation apply only to client mode David Ahern
2021-01-09 18:53 ` [PATCH 09/11] selftests: Consistently specify address for MD5 protection David Ahern
2021-01-09 18:53 ` [PATCH 10/11] selftests: Add new option for client-side passwords David Ahern
2021-01-09 18:53 ` [PATCH 11/11] selftests: Add separate options for server device bindings David Ahern
2021-01-09 18:55 ` [PATCH 00/11] selftests: Updates to allow single instance of nettest for client and server David Ahern
2021-01-09 19:02   ` Jakub Kicinski
2021-01-09 23:04     ` Jakub Kicinski
2021-01-09 23:12       ` David Ahern
2021-01-09 23:17         ` Jakub Kicinski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210109185358.34616-7-dsahern@kernel.org \
    --to=dsahern@kernel.org \
    --cc=davem@davemloft.net \
    --cc=dsahern@gmail.com \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=schoen@loyalty.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.