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 3/3] test: fix FreeBSD file closing function
Date: Fri, 8 Nov 2019 11:21:35 +0100 [thread overview]
Message-ID: <20191108102135.7249-4-kkanas@marvell.com> (raw)
In-Reply-To: <20191108102135.7249-1-kkanas@marvell.com>
From: Krzysztof Kanas <kkanas@marvell.com>
The FreeBSD was iterating over non existing procfs entries, where sysctl
could give same information.
Signed-off-by: Krzysztof Kanas <kkanas@marvell.com>
---
app/test/process.h | 51 +++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 50 insertions(+), 1 deletion(-)
diff --git a/app/test/process.h b/app/test/process.h
index 34afac5a1f39..77bf11316355 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -16,6 +16,13 @@
#include <rte_string_fns.h> /* strlcpy */
+#ifdef RTE_EXEC_ENV_FREEBSD
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <sys/user.h>
+#endif
+
#ifdef RTE_EXEC_ENV_FREEBSD
#define self "curproc"
#define exe "file"
@@ -34,7 +41,49 @@ extern uint16_t flag_for_send_pkts;
/* 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
+#ifdef RTE_EXEC_ENV_FREEBSD
+static inline void
+close_files(void)
+{
+ int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_FILEDESC };
+ size_t sysctl_len;
+ void *oldp;
+ int ret;
+
+ mib[3] = getpid();
+ ret = sysctl(mib, 4, NULL, &sysctl_len, NULL, 0);
+ if (ret < 0) {
+ rte_panic("Error sysctl failed %d %d %s\n", ret, errno,
+ strerror(errno));
+ return;
+ }
+ oldp = malloc(sysctl_len);
+ if (!oldp) {
+ rte_panic("Error malloc failed\n");
+ return;
+ }
+ ret = sysctl(mib, 4, oldp, &sysctl_len, NULL, 0);
+ if (ret < 0) {
+ ret = errno;
+ free(oldp);
+ rte_panic("Error sysctl failed %d %d %s\n", ret, errno,
+ strerror(errno));
+ }
+ char *curr = oldp, *end = (char *)oldp + sysctl_len;
+ struct kinfo_file *kf_info;
+ while (curr < end) {
+ kf_info = (struct kinfo_file *)curr;
+ if (kf_info->kf_fd <= 2) {
+ curr += kf_info->kf_structsize;
+ continue;
+ }
+ close(kf_info->kf_fd);
+ curr += kf_info->kf_structsize;
+ }
+ free(oldp);
+}
+
+#else
static inline void
close_files(void)
{
--
2.21.0
next prev parent reply other threads:[~2019-11-08 10:24 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 ` [dpdk-dev] [PATCH v3 2/3] test: move close files to separate function kkanas
2019-11-08 10:21 ` kkanas [this message]
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-4-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).