doc: add patch dependency syntax to contributing guide

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

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index f5feb62..7842c3b 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -179,9 +179,7 @@ struct fwd_engine * fwd_engines[] = {
        &csum_fwd_engine,
        &icmp_echo_engine,
        &noisy_vnf_engine,
-#if defined RTE_LIBRTE_PMD_SOFTNIC
-       &softnic_fwd_engine,
-#endif
+       &five_tuple_swap_fwd_engine,
 #ifdef RTE_LIBRTE_IEEE1588
        &ieee1588_fwd_engine,
 #endif
@@ -223,6 +221,12 @@ enum tx_pkt_split tx_pkt_split = TX_PKT_SPLIT_OFF;
 uint8_t txonly_multi_flow;
 /**< Whether multiple flows are generated in TXONLY mode. */
 
+uint32_t tx_pkt_times_inter;
+/**< Timings for send scheduling in TXONLY mode, time between bursts. */
+
+uint32_t tx_pkt_times_intra;
+/**< Timings for send scheduling in TXONLY mode, time between packets. */
+
 uint16_t nb_pkt_per_burst = DEF_PKT_BURST; /**< Number of packets per burst. */
 uint16_t mb_mempool_cache = DEF_MBUF_CACHE; /**< Size of mbuf mempool cache. */
 
@@ -1561,19 +1565,6 @@ init_config(void)
                                        "rte_gro_ctx_create() failed\n");
                }
        }
-
-#if defined RTE_LIBRTE_PMD_SOFTNIC
-       if (strcmp(cur_fwd_eng->fwd_mode_name, "softnic") == 0) {
-               RTE_ETH_FOREACH_DEV(pid) {
-                       port = &ports[pid];
-                       const char *driver = port->dev_info.driver_name;
-
-                       if (strcmp(driver, "net_softnic") == 0)
-                               port->softport.fwd_lcore_arg = fwd_lcores;
-               }
-       }
-#endif
-
 }
 
 
@@ -1972,13 +1963,21 @@ fwd_stats_display(void)
               acc_stats_border, acc_stats_border);
 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
 #define CYC_PER_MHZ 1E6
-       if (total_recv > 0)
+       if (total_recv > 0 || total_xmit > 0) {
+               uint64_t total_pkts = 0;
+               if (strcmp(cur_fwd_eng->fwd_mode_name, "txonly") == 0 ||
+                   strcmp(cur_fwd_eng->fwd_mode_name, "flowgen") == 0)
+                       total_pkts = total_xmit;
+               else
+                       total_pkts = total_recv;
+
                printf("\n  CPU cycles/packet=%.2F (total cycles="
-                      "%"PRIu64" / total RX packets=%"PRIu64") at %"PRIu64
+                      "%"PRIu64" / total %s packets=%"PRIu64") at %"PRIu64
                       " MHz Clock\n",
-                      (double) fwd_cycles / total_recv,
-                      fwd_cycles, total_recv,
+                      (double) fwd_cycles / total_pkts,
+                      fwd_cycles, cur_fwd_eng->fwd_mode_name, total_pkts,
                       (uint64_t)(rte_get_tsc_hz() / CYC_PER_MHZ));
+       }
 #endif
 }