app/testpmd: fix NUMA structures initialization

[dpdk.git] / app / test-pmd / testpmd.c

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 0c6a50e..dd216f6 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -95,6 +95,7 @@ uint16_t verbose_level = 0; /**< Silent by default. */
 /* use master core for command line ? */
 uint8_t interactive = 0;
 uint8_t auto_start = 0;
+char cmdline_filename[PATH_MAX] = {0};
 
 /*
  * NUMA support configuration.
@@ -355,8 +356,12 @@ uint16_t nb_rx_queue_stats_mappings = 0;
 
 unsigned max_socket = 0;
 
+#ifdef RTE_LIBRTE_BITRATE
 /* Bitrate statistics */
 struct rte_stats_bitrates *bitrate_data;
+lcoreid_t bitrate_lcore_id;
+uint8_t bitrate_enabled;
+#endif
 
 /* Forward function declarations */
 static void map_port_queue_stats_mapping_registers(uint8_t pi, struct rte_port *port);
@@ -524,6 +529,13 @@ init_config(void)
        uint8_t port_per_socket[RTE_MAX_NUMA_NODES];
 
        memset(port_per_socket,0,RTE_MAX_NUMA_NODES);
+
+       if (numa_support) {
+               memset(port_numa, NUMA_NO_CONFIG, RTE_MAX_ETHPORTS);
+               memset(rxring_numa, NUMA_NO_CONFIG, RTE_MAX_ETHPORTS);
+               memset(txring_numa, NUMA_NO_CONFIG, RTE_MAX_ETHPORTS);
+       }
+
        /* Configuration of logical cores. */
        fwd_lcores = rte_zmalloc("testpmd: fwd_lcores",
                                sizeof(struct fwd_lcore *) * nb_lcores,
@@ -951,16 +963,23 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
                for (sm_id = 0; sm_id < nb_fs; sm_id++)
                        (*pkt_fwd)(fsm[sm_id]);
 #ifdef RTE_LIBRTE_BITRATE
-               tics_current = rte_rdtsc();
-               if (tics_current - tics_datum >= tics_per_1sec) {
-                       /* Periodic bitrate calculation */
-                       for (idx_port = 0; idx_port < cnt_ports; idx_port++)
-                               rte_stats_bitrate_calc(bitrate_data, idx_port);
-                       tics_datum = tics_current;
+               if (bitrate_enabled != 0 &&
+                               bitrate_lcore_id == rte_lcore_id()) {
+                       tics_current = rte_rdtsc();
+                       if (tics_current - tics_datum >= tics_per_1sec) {
+                               /* Periodic bitrate calculation */
+                               for (idx_port = 0;
+                                               idx_port < cnt_ports;
+                                               idx_port++)
+                                       rte_stats_bitrate_calc(bitrate_data,
+                                               idx_port);
+                               tics_datum = tics_current;
+                       }
                }
 #endif
 #ifdef RTE_LIBRTE_LATENCY_STATS
-               if (latencystats_lcore_id == rte_lcore_id())
+               if (latencystats_enabled != 0 &&
+                               latencystats_lcore_id == rte_lcore_id())
                        rte_latencystats_update();
 #endif
 
@@ -1768,7 +1787,7 @@ rmv_event_callback(void *arg)
        if (da->type == RTE_DEVTYPE_VIRTUAL)
                snprintf(name, sizeof(name), "%s", da->virt.drv_name);
        else if (da->type == RTE_DEVTYPE_WHITELISTED_PCI)
-               rte_eal_pci_device_name(&da->pci.addr, name, sizeof(name));
+               rte_pci_device_name(&da->pci.addr, name, sizeof(name));
        printf("removing device %s\n", name);
        rte_eal_dev_detach(name);
        dev->state = RTE_ETH_DEV_UNUSED;
@@ -2227,6 +2246,14 @@ main(int argc, char** argv)
                rte_panic("Empty set of forwarding logical cores - check the "
                          "core mask supplied in the command parameters\n");
 
+       /* Bitrate/latency stats disabled by default */
+#ifdef RTE_LIBRTE_BITRATE
+       bitrate_enabled = 0;
+#endif
+#ifdef RTE_LIBRTE_LATENCY_STATS
+       latencystats_enabled = 0;
+#endif
+
        argc -= diag;
        argv += diag;
        if (argc > 1)
@@ -2264,20 +2291,26 @@ main(int argc, char** argv)
 
        /* Setup bitrate stats */
 #ifdef RTE_LIBRTE_BITRATE
-       bitrate_data = rte_stats_bitrate_create();
-       if (bitrate_data == NULL)
-               rte_exit(EXIT_FAILURE, "Could not allocate bitrate data.\n");
-       rte_stats_bitrate_reg(bitrate_data);
+       if (bitrate_enabled != 0) {
+               bitrate_data = rte_stats_bitrate_create();
+               if (bitrate_data == NULL)
+                       rte_exit(EXIT_FAILURE,
+                               "Could not allocate bitrate data.\n");
+               rte_stats_bitrate_reg(bitrate_data);
+       }
 #endif
 
-
 #ifdef RTE_LIBRTE_CMDLINE
+       if (strlen(cmdline_filename) != 0)
+               cmdline_read_from_file(cmdline_filename);
+
        if (interactive == 1) {
                if (auto_start) {
                        printf("Start automatic packet forwarding\n");
                        start_packet_forwarding(0);
                }
                prompt();
+               pmd_test_exit();
        } else
 #endif
        {