public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top, Stefano Brivio <sbrivio@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH v2 08/14] nstool: Helpers to iterate through namespace types
Date: Thu,  6 Apr 2023 13:28:13 +1000	[thread overview]
Message-ID: <20230406032819.707441-9-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20230406032819.707441-1-david@gibson.dropbear.id.au>

Will make things a bit less verbose in future.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 test/nstool.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/test/nstool.c b/test/nstool.c
index 7b222dd..b70b053 100644
--- a/test/nstool.c
+++ b/test/nstool.c
@@ -46,6 +46,14 @@ const struct ns_type nstypes[] = {
 	{ CLONE_NEWUTS, "uts" },
 };
 
+#define for_each_nst(_nst, _flags)				\
+	for ((_nst) = &nstypes[0];				\
+	     ((_nst) - nstypes) < ARRAY_SIZE(nstypes);		\
+	     (_nst)++)						\
+		if ((_flags) & (_nst)->flag)
+
+#define for_every_nst(_nst)	for_each_nst(_nst, INT_MAX)
+
 #define NSTOOL_MAGIC	0x7570017575601d75ULL
 
 struct holder_info {
@@ -199,11 +207,10 @@ static ssize_t getlink(char *buf, size_t bufsiz, const char *fmt, ...)
 
 static int detect_namespaces(pid_t pid)
 {
-	int i;
+	const struct ns_type *nst;
 	int flags = 0;
 
-	for (i = 0; i < ARRAY_SIZE(nstypes); i++) {
-		const struct ns_type *nst = &nstypes[i];
+	for_every_nst(nst) {
 		char selflink[PATH_MAX], pidlink[PATH_MAX];
 		ssize_t selflen, pidlen;
 
@@ -221,15 +228,10 @@ static int detect_namespaces(pid_t pid)
 
 static void print_nstypes(int flags)
 {
+	const struct ns_type *nst;
 	bool first = true;
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(nstypes); i++) {
-		const struct ns_type *nst = &nstypes[i];
-
-		if (!(flags & nst->flag))
-			continue;
 
+	for_each_nst(nst, flags) {
 		printf("%s%s", first ? "" : ", " , nst->name);
 		first = false;
 		flags &= ~nst->flag;
-- 
@@ -46,6 +46,14 @@ const struct ns_type nstypes[] = {
 	{ CLONE_NEWUTS, "uts" },
 };
 
+#define for_each_nst(_nst, _flags)				\
+	for ((_nst) = &nstypes[0];				\
+	     ((_nst) - nstypes) < ARRAY_SIZE(nstypes);		\
+	     (_nst)++)						\
+		if ((_flags) & (_nst)->flag)
+
+#define for_every_nst(_nst)	for_each_nst(_nst, INT_MAX)
+
 #define NSTOOL_MAGIC	0x7570017575601d75ULL
 
 struct holder_info {
@@ -199,11 +207,10 @@ static ssize_t getlink(char *buf, size_t bufsiz, const char *fmt, ...)
 
 static int detect_namespaces(pid_t pid)
 {
-	int i;
+	const struct ns_type *nst;
 	int flags = 0;
 
-	for (i = 0; i < ARRAY_SIZE(nstypes); i++) {
-		const struct ns_type *nst = &nstypes[i];
+	for_every_nst(nst) {
 		char selflink[PATH_MAX], pidlink[PATH_MAX];
 		ssize_t selflen, pidlen;
 
@@ -221,15 +228,10 @@ static int detect_namespaces(pid_t pid)
 
 static void print_nstypes(int flags)
 {
+	const struct ns_type *nst;
 	bool first = true;
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(nstypes); i++) {
-		const struct ns_type *nst = &nstypes[i];
-
-		if (!(flags & nst->flag))
-			continue;
 
+	for_each_nst(nst, flags) {
 		printf("%s%s", first ? "" : ", " , nst->name);
 		first = false;
 		flags &= ~nst->flag;
-- 
2.39.2


  parent reply	other threads:[~2023-04-06  3:28 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-06  3:28 [PATCH v2 00/14] Improved tool for testing across multiple namespaces David Gibson
2023-04-06  3:28 ` [PATCH v2 01/14] nstool: Rename nsholder to nstool David Gibson
2023-04-06  3:28 ` [PATCH v2 02/14] nstool: Reverse parameters " David Gibson
2023-04-06  3:28 ` [PATCH v2 03/14] nstool: Move description of its operation modes from comment to usage David Gibson
2023-04-06  3:28 ` [PATCH v2 04/14] nstool: Split some command line parsing and socket setup to subcommands David Gibson
2023-04-06  3:28 ` [PATCH v2 05/14] nstool: Replace "pid" subcommand with "info" subcommand David Gibson
2023-04-06  3:28 ` [PATCH v2 06/14] nstool: Detect what namespaces target is in David Gibson
2023-04-06  3:28 ` [PATCH v2 07/14] nstool: Add magic number to advertized information David Gibson
2023-04-06  3:28 ` David Gibson [this message]
2023-04-06  3:28 ` [PATCH v2 09/14] nstool: Add nstool exec command to execute commands in an nstool namespace David Gibson
2023-04-06  3:28 ` [PATCH v2 10/14] nstool: Add --keep-caps option to nstool exec David Gibson
2023-04-06  3:28 ` [PATCH v2 11/14] test: Initialise ${TRACE} properly David Gibson
2023-04-06  3:28 ` [PATCH v2 12/14] test: Use "nstool exec" to slightly simplify tests David Gibson
2023-04-06  3:28 ` [PATCH v2 13/14] nstool: Advertise the holder's cwd (in its mountns) across the socket David Gibson
2023-04-06  3:28 ` [PATCH v2 14/14] nstool: Enter holder's cwd when changing mount ns with nstool exec David Gibson
2023-04-07 23:12 ` [PATCH v2 00/14] Improved tool for testing across multiple namespaces Stefano Brivio

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=20230406032819.707441-9-david@gibson.dropbear.id.au \
    --to=david@gibson.dropbear.id.au \
    --cc=passt-dev@passt.top \
    --cc=sbrivio@redhat.com \
    /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.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).