app/testpmd: add traffic management forwarding mode

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

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 1f0d8f1..23352be 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -164,6 +164,10 @@ struct fwd_engine * fwd_engines[] = {
        &tx_only_engine,
        &csum_fwd_engine,
        &icmp_echo_engine,
+#if defined RTE_LIBRTE_PMD_SOFTNIC && defined RTE_LIBRTE_SCHED
+       &softnic_tm_engine,
+       &softnic_tm_bypass_engine,
+#endif
 #ifdef RTE_LIBRTE_IEEE1588
        &ieee1588_fwd_engine,
 #endif
@@ -180,6 +184,13 @@ uint16_t mbuf_data_size = DEFAULT_MBUF_DATA_SIZE; /**< Mbuf data space size. */
 uint32_t param_total_num_mbufs = 0;  /**< number of mbufs in all pools - if
                                       * specified on command-line. */
 uint16_t stats_period; /**< Period to show statistics (disabled by default) */
+
+/*
+ * In container, it cannot terminate the process which running with 'stats-period'
+ * option. Set flag to exit stats period loop after received SIGINT/SIGTERM.
+ */
+uint8_t f_quit;
+
 /*
  * Configuration of packet segments used by the "txonly" processing engine.
  */
@@ -2102,6 +2113,17 @@ init_port_config(void)
                    (rte_eth_devices[pid].data->dev_flags &
                     RTE_ETH_DEV_INTR_RMV))
                        port->dev_conf.intr_conf.rmv = 1;
+
+#if defined RTE_LIBRTE_PMD_SOFTNIC && defined RTE_LIBRTE_SCHED
+               /* Detect softnic port */
+               if (!strcmp(port->dev_info.driver_name, "net_softnic")) {
+                       port->softnic_enable = 1;
+                       memset(&port->softport, 0, sizeof(struct softnic_port));
+
+                       if (!strcmp(cur_fwd_eng->fwd_mode_name, "tm"))
+                               port->softport.tm_flag = 1;
+               }
+#endif
        }
 }
 
@@ -2335,6 +2357,8 @@ signal_handler(int signum)
                rte_latencystats_uninit();
 #endif
                force_quit();
+               /* Set flag to indicate the force termination. */
+               f_quit = 1;
                /* exit with the expected status */
                signal(signum, SIG_DFL);
                kill(getpid(), signum);
@@ -2457,6 +2481,8 @@ main(int argc, char** argv)
                char c;
                int rc;
 
+               f_quit = 0;
+
                printf("No commandline core given, start packet forwarding\n");
                start_packet_forwarding(tx_first);
                if (stats_period != 0) {
@@ -2466,7 +2492,7 @@ main(int argc, char** argv)
                        /* Convert to number of cycles */
                        timer_period = stats_period * rte_get_timer_hz();
 
-                       while (1) {
+                       while (f_quit == 0) {
                                cur_time = rte_get_timer_cycles();
                                diff_time += cur_time - prev_time;