test/crypto: add TTL and hop limit decrement cases

[dpdk.git] / app / test / process.h

diff --git a/app/test/process.h b/app/test/process.h
index 191d279..1f073b9 100644 (file)
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -7,12 +7,14 @@
 
 #include <errno.h>  /* errno */
 #include <limits.h> /* PATH_MAX */
+#ifndef RTE_EXEC_ENV_WINDOWS
 #include <libgen.h> /* basename et al */
+#include <sys/wait.h>
+#endif
 #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 */
 
@@ -24,11 +26,13 @@
 #define exe "exe"
 #endif
 
-#ifdef RTE_LIBRTE_PDUMP
+#ifdef RTE_LIB_PDUMP
+#ifdef RTE_NET_RING
 #include <pthread.h>
 extern void *send_pkts(void *empty);
 extern uint16_t flag_for_send_pkts;
 #endif
+#endif
 
 /*
  * launches a second copy of the test process using the given argv parameters,
@@ -43,8 +47,11 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
        char *argv_cpy[numargs + 1];
        int i, status;
        char path[32];
-#ifdef RTE_LIBRTE_PDUMP
+#ifdef RTE_LIB_PDUMP
+#ifdef RTE_NET_RING
        pthread_t thread;
+       int rc;
+#endif
 #endif
 
        pid_t pid = fork();
@@ -85,6 +92,11 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
                        }
 
                        while ((dirent = readdir(dir)) != NULL) {
+
+                               if (strcmp(dirent->d_name, ".") == 0 ||
+                                       strcmp(dirent->d_name, "..") == 0)
+                                       continue;
+
                                errno = 0;
                                fd = strtol(dirent->d_name, &endptr, 10);
                                if (errno != 0 || endptr[0] != '\0') {
@@ -105,6 +117,7 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
                for (i = 0; i < num; i++)
                        printf("'%s' ", argv_cpy[i]);
                printf("\n");
+               fflush(stdout);
 
                /* set the environment variable */
                if (setenv(RECURSIVE_ENV_VAR, env_value, 1) != 0)
@@ -120,18 +133,27 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
                }
        }
        /* parent process does a wait */
-#ifdef RTE_LIBRTE_PDUMP
-       if ((strcmp(env_value, "run_pdump_server_tests") == 0))
-               pthread_create(&thread, NULL, &send_pkts, NULL);
+#ifdef RTE_LIB_PDUMP
+#ifdef RTE_NET_RING
+       if ((strcmp(env_value, "run_pdump_server_tests") == 0)) {
+               rc = pthread_create(&thread, NULL, &send_pkts, NULL);
+               if (rc != 0) {
+                       rte_panic("Cannot start send pkts thread: %s\n",
+                                 strerror(rc));
+               }
+       }
+#endif
 #endif
 
        while (wait(&status) != pid)
                ;
-#ifdef RTE_LIBRTE_PDUMP
+#ifdef RTE_LIB_PDUMP
+#ifdef RTE_NET_RING
        if ((strcmp(env_value, "run_pdump_server_tests") == 0)) {
                flag_for_send_pkts = 0;
                pthread_join(thread, NULL);
        }
+#endif
 #endif
        return status;
 }