eal: do not reset getopt lib

[dpdk.git] / lib / librte_eal / linuxapp / eal / eal.c

diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index 8809f57..18fe19b 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -75,7 +75,6 @@
 #include <rte_version.h>
 #include <rte_atomic.h>
 #include <malloc_heap.h>
-#include <rte_eth_ring.h>
 
 #include "eal_private.h"
 #include "eal_thread.h"
@@ -506,8 +505,12 @@ eal_log_level_parse(int argc, char **argv)
        int opt;
        char **argvopt;
        int option_index;
+       const int old_optind = optind;
+       const int old_optopt = optopt;
+       char * const old_optarg = optarg;
 
        argvopt = argv;
+       optind = 1;
 
        eal_reset_internal_config(&internal_config);
 
@@ -528,7 +531,10 @@ eal_log_level_parse(int argc, char **argv)
                        break;
        }
 
-       optind = 0; /* reset getopt lib */
+       /* restore getopt lib */
+       optind = old_optind;
+       optopt = old_optopt;
+       optarg = old_optarg;
 }
 
 /* Parse the argument given in the command line of the application */
@@ -540,25 +546,29 @@ eal_parse_args(int argc, char **argv)
        int option_index;
        char *prgname = argv[0];
        struct shared_driver *solib;
+       const int old_optind = optind;
+       const int old_optopt = optopt;
+       char * const old_optarg = optarg;
 
        argvopt = argv;
+       optind = 1;
 
        while ((opt = getopt_long(argc, argvopt, eal_short_options,
                                  eal_long_options, &option_index)) != EOF) {
 
-               int ret;
-
                /* getopt is not happy, stop right now */
                if (opt == '?') {
                        eal_usage(prgname);
-                       return -1;
+                       ret = -1;
+                       goto out;
                }
 
                ret = eal_parse_common_option(opt, optarg, &internal_config);
                /* common parser is not happy */
                if (ret < 0) {
                        eal_usage(prgname);
-                       return -1;
+                       ret = -1;
+                       goto out;
                }
                /* common parser handled this option */
                if (ret == 0)
@@ -574,7 +584,8 @@ eal_parse_args(int argc, char **argv)
                        solib = malloc(sizeof(*solib));
                        if (solib == NULL) {
                                RTE_LOG(ERR, EAL, "malloc(solib) failed\n");
-                               return -1;
+                               ret = -1;
+                               goto out;
                        }
                        memset(solib, 0, sizeof(*solib));
                        strncpy(solib->name, optarg, PATH_MAX-1);
@@ -590,7 +601,8 @@ eal_parse_args(int argc, char **argv)
                        RTE_LOG(ERR, EAL, "Can't support DPDK app "
                                "running on Dom0, please configure"
                                " RTE_LIBRTE_XEN_DOM0=y\n");
-                       return -1;
+                       ret = -1;
+                       goto out;
 #endif
                        break;
 
@@ -607,7 +619,8 @@ eal_parse_args(int argc, char **argv)
                                RTE_LOG(ERR, EAL, "invalid parameters for --"
                                                OPT_SOCKET_MEM "\n");
                                eal_usage(prgname);
-                               return -1;
+                               ret = -1;
+                               goto out;
                        }
                        break;
 
@@ -616,7 +629,8 @@ eal_parse_args(int argc, char **argv)
                                RTE_LOG(ERR, EAL, "invalid parameter for --"
                                                OPT_BASE_VIRTADDR "\n");
                                eal_usage(prgname);
-                               return -1;
+                               ret = -1;
+                               goto out;
                        }
                        break;
 
@@ -625,7 +639,8 @@ eal_parse_args(int argc, char **argv)
                                RTE_LOG(ERR, EAL, "invalid parameters for --"
                                                OPT_VFIO_INTR "\n");
                                eal_usage(prgname);
-                               return -1;
+                               ret = -1;
+                               goto out;
                        }
                        break;
 
@@ -647,17 +662,21 @@ eal_parse_args(int argc, char **argv)
                                        "on Linux\n", opt);
                        }
                        eal_usage(prgname);
-                       return -1;
+                       ret = -1;
+                       goto out;
                }
        }
 
-       if (eal_adjust_config(&internal_config) != 0)
-               return -1;
+       if (eal_adjust_config(&internal_config) != 0) {
+               ret = -1;
+               goto out;
+       }
 
        /* sanity checks */
        if (eal_check_common_options(&internal_config) != 0) {
                eal_usage(prgname);
-               return -1;
+               ret = -1;
+               goto out;
        }
 
        /* --xen-dom0 doesn't make sense with --socket-mem */
@@ -665,13 +684,20 @@ eal_parse_args(int argc, char **argv)
                RTE_LOG(ERR, EAL, "Options --"OPT_SOCKET_MEM" cannot be specified "
                        "together with --"OPT_XEN_DOM0"\n");
                eal_usage(prgname);
-               return -1;
+               ret = -1;
+               goto out;
        }
 
        if (optind >= 0)
                argv[optind-1] = prgname;
        ret = optind-1;
-       optind = 0; /* reset getopt lib */
+
+out:
+       /* restore getopt lib */
+       optind = old_optind;
+       optopt = old_optopt;
+       optarg = old_optarg;
+
        return ret;
 }
 
@@ -735,6 +761,7 @@ rte_eal_init(int argc, char **argv)
        struct shared_driver *solib = NULL;
        const char *logid;
        char cpuset[RTE_CPU_AFFINITY_STR_LEN];
+       char thread_name[RTE_MAX_THREAD_NAME_LEN];
 
        if (!rte_atomic32_test_and_set(&run_once))
                return -1;
@@ -818,9 +845,6 @@ rte_eal_init(int argc, char **argv)
        if (rte_eal_alarm_init() < 0)
                rte_panic("Cannot init interrupt-handling thread\n");
 
-       if (rte_eal_intr_init() < 0)
-               rte_panic("Cannot init interrupt-handling thread\n");
-
        if (rte_eal_timer_init() < 0)
                rte_panic("Cannot init HPET or TSC timers\n");
 
@@ -829,7 +853,7 @@ rte_eal_init(int argc, char **argv)
        rte_eal_mcfg_complete();
 
        TAILQ_FOREACH(solib, &solib_list, next) {
-               RTE_LOG(INFO, EAL, "open shared lib %s\n", solib->name);
+               RTE_LOG(DEBUG, EAL, "open shared lib %s\n", solib->name);
                solib->lib_handle = dlopen(solib->name, RTLD_NOW);
                if (solib->lib_handle == NULL)
                        RTE_LOG(WARNING, EAL, "%s\n", dlerror());
@@ -846,6 +870,9 @@ rte_eal_init(int argc, char **argv)
        if (rte_eal_dev_init() < 0)
                rte_panic("Cannot init pmd devices\n");
 
+       if (rte_eal_intr_init() < 0)
+               rte_panic("Cannot init interrupt-handling thread\n");
+
        RTE_LCORE_FOREACH_SLAVE(i) {
 
                /*
@@ -864,6 +891,15 @@ rte_eal_init(int argc, char **argv)
                                     eal_thread_loop, NULL);
                if (ret != 0)
                        rte_panic("Cannot create thread\n");
+
+               /* Set thread_name for aid in debugging. */
+               snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN,
+                       "lcore-slave-%d", i);
+               ret = pthread_setname_np(lcore_config[i].thread_id,
+                                               thread_name);
+               if (ret != 0)
+                       RTE_LOG(ERR, EAL,
+                               "Cannot set name for lcore thread\n");
        }
 
        /*