replace zero-length arrays with flexible ones

[dpdk.git] / app / test / test_pmd_perf.c

diff --git a/app/test/test_pmd_perf.c b/app/test/test_pmd_perf.c
index 0aa9dc1..ec3dc25 100644 (file)
--- a/app/test/test_pmd_perf.c
+++ b/app/test/test_pmd_perf.c
@@ -296,6 +296,7 @@ reset_count(void)
        idle = 0;
 }
 
+#ifndef RTE_EXEC_ENV_WINDOWS
 static void
 stats_display(uint16_t port_id)
 {
@@ -325,6 +326,7 @@ signal_handler(int signum)
        if (signum == SIGUSR2)
                stats_display(0);
 }
+#endif
 
 struct rte_mbuf **tx_burst;
 
@@ -454,6 +456,7 @@ main_loop(__rte_unused void *args)
 #define PACKET_SIZE 64
 #define FRAME_GAP 12
 #define MAC_PREAMBLE 8
+#define MAX_RETRY_COUNT 5
        struct rte_mbuf *pkts_burst[MAX_PKT_BURST];
        unsigned lcore_id;
        unsigned i, portid, nb_rx = 0, nb_tx = 0;
@@ -461,6 +464,8 @@ main_loop(__rte_unused void *args)
        int pkt_per_port;
        uint64_t diff_tsc;
        uint64_t packets_per_second, total_packets;
+       int retry_cnt = 0;
+       int free_pkt = 0;
 
        lcore_id = rte_lcore_id();
        conf = &lcore_conf[lcore_id];
@@ -478,10 +483,19 @@ main_loop(__rte_unused void *args)
                        nb_tx = RTE_MIN(MAX_PKT_BURST, num);
                        nb_tx = rte_eth_tx_burst(portid, 0,
                                                &tx_burst[idx], nb_tx);
+                       if (nb_tx == 0)
+                               retry_cnt++;
                        num -= nb_tx;
                        idx += nb_tx;
+                       if (retry_cnt == MAX_RETRY_COUNT) {
+                               retry_cnt = 0;
+                               break;
+                       }
                }
        }
+       for (free_pkt = idx; free_pkt < (MAX_TRAFFIC_BURST * conf->nb_ports);
+                       free_pkt++)
+               rte_pktmbuf_free(tx_burst[free_pkt]);
        printf("Total packets inject to prime ports = %u\n", idx);
 
        packets_per_second = (link_mbps * 1000 * 1000) /
@@ -638,7 +652,7 @@ exec_burst(uint32_t flags, int lcore)
                i = (i >= conf->nb_ports - 1) ? 0 : (i + 1);
        }
 
-       sleep(5);
+       rte_delay_us(5 * US_PER_S);
 
        /* only when polling second  */
        if (flags == SC_BURST_XMIT_FIRST)
@@ -669,8 +683,10 @@ test_pmd_perf(void)
 
        printf("Start PMD RXTX cycles cost test.\n");
 
+#ifndef RTE_EXEC_ENV_WINDOWS
        signal(SIGUSR1, signal_handler);
        signal(SIGUSR2, signal_handler);
+#endif
 
        nb_ports = rte_eth_dev_count_avail();
        if (nb_ports < NB_ETHPORTS_USED) {