add FILE argument to debug functions

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

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 97229a5..bb4972c 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -83,6 +83,7 @@ uint16_t verbose_level = 0; /**< Silent by default. */
 
 /* use master core for command line ? */
 uint8_t interactive = 0;
+uint8_t auto_start = 0;
 
 /*
  * NUMA support configuration.
@@ -144,9 +145,12 @@ struct fwd_engine * fwd_engines[] = {
        &io_fwd_engine,
        &mac_fwd_engine,
        &mac_retry_fwd_engine,
+       &mac_swap_engine,
+       &flow_gen_engine,
        &rx_only_engine,
        &tx_only_engine,
        &csum_fwd_engine,
+       &icmp_echo_engine,
 #ifdef RTE_LIBRTE_IEEE1588
        &ieee1588_fwd_engine,
 #endif
@@ -258,6 +262,11 @@ uint16_t port_topology = PORT_TOPOLOGY_PAIRED; /* Ports are paired by default */
  */
 uint8_t no_flush_rx = 0; /* flush by default */
 
+/*
+ * Avoids to check link status when starting/stopping a port.
+ */
+uint8_t no_link_check = 0; /* check by default */
+
 /*
  * NIC bypass mode configuration options.
  */
@@ -471,7 +480,7 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
                rte_exit(EXIT_FAILURE, "Creation of mbuf pool for socket %u "
                                                "failed\n", socket_id);
        } else if (verbose_level > 0) {
-               rte_mempool_dump(rte_mp);
+               rte_mempool_dump(stdout, rte_mp);
        }
 }
 
@@ -552,15 +561,6 @@ init_config(void)
                        mbuf_pool_create(mbuf_data_size, nb_mbuf_per_pool,
                                                 socket_num);
        }
-       /*
-        * Records which Mbuf pool to use by each logical core, if needed.
-        */
-       for (lc_id = 0; lc_id < nb_lcores; lc_id++) {
-               mbp = mbuf_pool_find(rte_lcore_to_socket_id(lc_id));
-               if (mbp == NULL)
-                       mbp = mbuf_pool_find(0);
-               fwd_lcores[lc_id]->mbp = mbp;
-       }
 
        /* Configuration of Ethernet ports. */
        ports = rte_zmalloc("testpmd: ports",
@@ -609,6 +609,17 @@ init_config(void)
                }
        }
        init_port_config();
+
+       /*
+        * Records which Mbuf pool to use by each logical core, if needed.
+        */
+       for (lc_id = 0; lc_id < nb_lcores; lc_id++) {
+               mbp = mbuf_pool_find(rte_lcore_to_socket_id(lc_id));
+               if (mbp == NULL)
+                       mbp = mbuf_pool_find(0);
+               fwd_lcores[lc_id]->mbp = mbp;
+       }
+
        /* Configuration of packet forwarding streams. */
        if (init_fwd_streams() < 0)
                rte_exit(EXIT_FAILURE, "FAIL from init_fwd_streams()\n");
@@ -1221,6 +1232,7 @@ start_port(portid_t pid)
        portid_t pi;
        queueid_t qi;
        struct rte_port *port;
+       uint8_t *mac_addr;
 
        if (test_done == 0) {
                printf("Please stop forwarding first\n");
@@ -1248,7 +1260,7 @@ start_port(portid_t pid)
                if (port->need_reconfig > 0) {
                        port->need_reconfig = 0;
 
-                       printf("Configuring Port %d (socket %d)\n", pi,
+                       printf("Configuring Port %d (socket %u)\n", pi,
                                        port->socket_id);
                        /* configure port */
                        diag = rte_eth_dev_configure(pi, nb_rxq, nb_txq,
@@ -1348,11 +1360,16 @@ start_port(portid_t pid)
                        RTE_PORT_HANDLING, RTE_PORT_STARTED) == 0)
                        printf("Port %d can not be set into started\n", pi);
 
+               mac_addr = port->eth_addr.addr_bytes;
+               printf("Port %d: %02X:%02X:%02X:%02X:%02X:%02X\n", pi,
+                      mac_addr[0], mac_addr[1], mac_addr[2],
+                      mac_addr[3], mac_addr[4], mac_addr[5]);
+
                /* at least one port started, need checking link status */
                need_check_link_status = 1;
        }
 
-       if (need_check_link_status)
+       if (need_check_link_status && !no_link_check)
                check_all_ports_link_status(nb_ports, RTE_PORT_ALL);
        else
                printf("Please stop the ports first\n");
@@ -1394,7 +1411,7 @@ stop_port(portid_t pid)
                        printf("Port %d can not be set into stopped\n", pi);
                need_check_link_status = 1;
        }
-       if (need_check_link_status)
+       if (need_check_link_status && !no_link_check)
                check_all_ports_link_status(nb_ports, RTE_PORT_ALL);
 
        printf("Done\n");
@@ -1828,9 +1845,13 @@ main(int argc, char** argv)
                rte_eth_promiscuous_enable(port_id);
 
 #ifdef RTE_LIBRTE_CMDLINE
-       if (interactive == 1)
+       if (interactive == 1) {
+               if (auto_start) {
+                       printf("Start automatic packet forwarding\n");
+                       start_packet_forwarding(0);
+               }
                prompt();
-       else
+       } else
 #endif
        {
                char c;