app: no more bare metal environment

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

diff --git a/app/test/process.h b/app/test/process.h
index 8894360..057ba9f 100644 (file)
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -34,7 +34,13 @@
 #ifndef _PROCESS_H_
 #define _PROCESS_H_
 
-#ifndef RTE_EXEC_ENV_BAREMETAL
+#ifdef RTE_EXEC_ENV_BSDAPP
+#define self "curproc"
+#define exe "file"
+#else
+#define self "self"
+#define exe "exe"
+#endif
 
 /*
  * launches a second copy of the test process using the given argv parameters,
@@ -45,7 +51,12 @@
 static inline int
 process_dup(const char *const argv[], int numargs, const char *env_value)
 {
+       int num;
+#ifdef RTE_LIBRTE_XEN_DOM0
+       char *argv_cpy[numargs + 2];
+#else
        char *argv_cpy[numargs + 1];
+#endif
        int i, fd, status;
        char path[32];
 
@@ -56,24 +67,31 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
                /* make a copy of the arguments to be passed to exec */
                for (i = 0; i < numargs; i++)
                        argv_cpy[i] = strdup(argv[i]);
+       #ifdef RTE_LIBRTE_XEN_DOM0
+               argv_cpy[i] = strdup("--xen-dom0");
+               argv_cpy[i + 1] = NULL;
+               num = numargs + 1;
+       #else
                argv_cpy[i] = NULL;
+               num = numargs;
+       #endif
 
                /* 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-- ) {
-                       rte_snprintf(path, sizeof(path), "/proc/self/fd/%d", fd);
+                       snprintf(path, sizeof(path), "/proc/" exe "/fd/%d", fd);
                        if (access(path, F_OK) == 0)
                                close(fd);
                }
                printf("Running binary with argv[]:");
-               for (i = 0; i < numargs; i++)
+               for (i = 0; i < num; i++)
                        printf("'%s' ", argv_cpy[i]);
                printf("\n");
 
                /* set the environment variable */
                if (setenv(RECURSIVE_ENV_VAR, env_value, 1) != 0)
                        rte_panic("Cannot export environment variable\n");
-               if (execv("/proc/self/exe", argv_cpy) < 0)
+               if (execv("/proc/" self "/" exe, argv_cpy) < 0)
                        rte_panic("Cannot exec\n");
        }
        /* parent process does a wait */
@@ -82,6 +100,4 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
        return status;
 }
 
-#endif /* not baremetal */
-
 #endif /* _PROCESS_H_ */