From: Krzysztof Kanas <kka...@marvell.com>
Test eal_flags_autotest times out on 64 ARM due to excessive calls to
'access' system call. While at it fix process_dup logic so it tests
correct file path for opened fd's.
Fixes: af75078fece3 ("first public release")
Cc: intel.com
Signed-off-by: Krzysztof Kanas <kka...@marvell.com>
---
app/test/process.h | 43 ++++++++++++++++++++++++++++++++++++++-----
1 file changed, 38 insertions(+), 5 deletions(-)
diff --git a/app/test/process.h b/app/test/process.h
index 128ce41219a1..298ba288087a 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -11,6 +11,7 @@
#include <stdlib.h> /* NULL */
#include <string.h> /* strerror */
#include <unistd.h> /* readlink */
+#include <dirent.h>
#include <sys/wait.h>
#include <rte_string_fns.h> /* strlcpy */
@@ -40,8 +41,12 @@ process_dup(const char *const argv[], int numargs, const
char *env_value)
{
int num;
char *argv_cpy[numargs + 1];
- int i, fd, status;
+ int i, fd, fdir, status;
+ struct dirent *dirent;
+ const char *procdir = "/proc/self/fd/";
char path[32];
+ char *endptr;
+ DIR *dir;
#ifdef RTE_LIBRTE_PDUMP
pthread_t thread;
#endif
@@ -58,11 +63,39 @@ process_dup(const char *const argv[], int numargs, const
char *env_value)
/* close all open file descriptors, check /proc/self/fd to only
* call close on open fds. Exclude fds 0, 1 and 2*/
- for (fd = getdtablesize(); fd > 2; fd-- ) {
- snprintf(path, sizeof(path), "/proc/" exe "/fd/%d", fd);
- if (access(path, F_OK) == 0)
- close(fd);
+ 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);
+
printf("Running binary with argv[]:");
for (i = 0; i < num; i++)
printf("'%s' ", argv_cpy[i]);
--
2.21.0
