From: <kkanas@marvell.com>
To: <dev@dpdk.org>, <david.marchand@redhat.com>,
<ferruh.yigit@linux.intel.com>
Cc: Krzysztof Kanas <kkanas@marvell.com>
Subject: [dpdk-dev] [PATCH v3 2/3] test: move close files to separate function
Date: Fri, 8 Nov 2019 11:21:34 +0100 [thread overview]
Message-ID: <20191108102135.7249-3-kkanas@marvell.com> (raw)
In-Reply-To: <20191108102135.7249-1-kkanas@marvell.com>
From: Krzysztof Kanas <kkanas@marvell.com>
As iterating over opened files is different on Linux and FreeBSD move
to separate function.
Signed-off-by: Krzysztof Kanas <kkanas@marvell.com>
---
app/test/process.h | 89 ++++++++++++++++++++++++++--------------------
1 file changed, 50 insertions(+), 39 deletions(-)
diff --git a/app/test/process.h b/app/test/process.h
index 298ba288087a..34afac5a1f39 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -30,6 +30,54 @@ extern void *send_pkts(void *empty);
extern uint16_t flag_for_send_pkts;
#endif
+
+/* close all open file descriptors, check /proc/self/fd to only
+ * call close on open fds. Exclude fds 0, 1 and 2
+ */
+#ifdef RTE_EXEC_ENV_LINUX
+static inline void
+close_files(void)
+{
+ const char *procdir = "/proc/self/fd/";
+ struct dirent *dirent;
+ int fd, fdir, status;
+ char *endptr;
+ DIR *dir;
+
+ dir = opendir(procdir);
+ if (dir == NULL) {
+ rte_panic("Error opening %s: %s\n", procdir,
+ strerror(errno));
+ }
+
+ fdir = dirfd(dir);
+ if (fdir < 0) {
+ status = errno;
+ closedir(dir);
+ rte_panic("Error %d obtaining fd for dir %s: %s\n",
+ fdir, procdir, strerror(status));
+ }
+
+ while ((dirent = readdir(dir)) != NULL) {
+ if (!strcmp(".", dirent->d_name) ||
+ !strcmp("..", dirent->d_name))
+ continue;
+
+ errno = 0;
+ fd = strtol(dirent->d_name, &endptr, 10);
+ if (errno != 0 || endptr[0] != '\0') {
+ printf("Error converint name fd %d %s:\n",
+ fd, dirent->d_name);
+ continue;
+ }
+ if (fd == fdir || fd <= 2)
+ continue;
+
+ close(fd);
+ }
+ closedir(dir);
+}
+#endif
/*
* launches a second copy of the test process using the given argv parameters,
* which should include argv[0] as the process name. To identify in the
@@ -41,12 +89,8 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
{
int num;
char *argv_cpy[numargs + 1];
- int i, fd, fdir, status;
- struct dirent *dirent;
- const char *procdir = "/proc/self/fd/";
+ int i, status;
char path[32];
- char *endptr;
- DIR *dir;
#ifdef RTE_LIBRTE_PDUMP
pthread_t thread;
#endif
@@ -61,40 +105,7 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
argv_cpy[i] = NULL;
num = numargs;
- /* close all open file descriptors, check /proc/self/fd to only
- * call close on open fds. Exclude fds 0, 1 and 2*/
- dir = opendir(procdir);
- if (dir == NULL) {
- rte_panic("Error opening %s: %s\n", procdir,
- strerror(errno));
- }
-
- fdir = dirfd(dir);
- if (fdir < 0) {
- status = errno;
- closedir(dir);
- rte_panic("Error %d obtaining fd for dir %s: %s\n",
- fdir, procdir, strerror(status));
- }
-
- while ((dirent = readdir(dir)) != NULL) {
- if (!strcmp(".", dirent->d_name) ||
- !strcmp("..", dirent->d_name))
- continue;
-
- errno = 0;
- fd = strtol(dirent->d_name, &endptr, 10);
- if (errno != 0 || endptr[0] != '\0') {
- printf("Error converint name fd %d %s:\n",
- fd, dirent->d_name);
- continue;
- }
- if (fd == fdir || fd <= 2)
- continue;
-
- close(fd);
- }
- closedir(dir);
+ close_files();
printf("Running binary with argv[]:");
for (i = 0; i < num; i++)
--
2.21.0
next prev parent reply other threads:[~2019-11-08 10:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-02 7:52 [dpdk-dev] [PATCH] test: fix process dup fd close kkanas
2019-09-02 9:49 ` [dpdk-dev] [PATCH v2] " kkanas
2019-09-23 11:32 ` Krzysztof Kanas
2019-10-30 9:06 ` David Marchand
2019-11-04 7:52 ` [dpdk-dev] [EXT] " Krzysztof Kanas
2019-11-06 14:36 ` David Marchand
2019-11-06 14:58 ` [dpdk-dev] " David Marchand
2019-11-08 10:21 ` [dpdk-dev] [PATCH v3 0/3] test: fix timeout in flags autotest kkanas
2019-11-08 10:21 ` [dpdk-dev] [PATCH v3 1/3] " kkanas
2019-11-08 10:21 ` kkanas [this message]
2019-11-08 10:21 ` [dpdk-dev] [PATCH v3 3/3] test: fix FreeBSD file closing function kkanas
2019-11-08 11:05 ` [dpdk-dev] [PATCH v3 0/3] test: fix timeout in flags autotest David Marchand
2019-11-08 11:11 ` David Marchand
2019-11-08 13:45 ` David Marchand
2019-11-12 8:26 ` [dpdk-dev] [EXT] " Krzysztof Kanas
2019-11-12 20:34 ` David Marchand
2019-11-13 13:35 ` Krzysztof Kanas
2019-11-12 20:31 ` [dpdk-dev] [PATCH v4] test: optimise fd closing in forked test process David Marchand
2019-11-14 19:31 ` Kevin Traynor
2019-11-15 8:11 ` David Marchand
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=20191108102135.7249-3-kkanas@marvell.com \
--to=kkanas@marvell.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@linux.intel.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.
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 NNTP newsgroup(s).