app/testpmd: disable latency stats by default

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

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 6526018..b39cd63 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.
@@ -970,7 +971,8 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
                }
 #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
 
@@ -1778,7 +1780,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;
@@ -2237,8 +2239,13 @@ main(int argc, char** argv)
                rte_panic("Empty set of forwarding logical cores - check the "
                          "core mask supplied in the command parameters\n");
 
-       /* Bitrate stats disabled by default */
+       /* 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;
@@ -2286,8 +2293,10 @@ main(int argc, char** argv)
        }
 #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");