examples: time fixes

[dpdk.git] / examples / l3fwd-vf / main.c

diff --git a/examples/l3fwd-vf/main.c b/examples/l3fwd-vf/main.c
index 74c5cfe..22bc388 100644 (file)
--- a/examples/l3fwd-vf/main.c
+++ b/examples/l3fwd-vf/main.c
@@ -94,8 +94,6 @@
 
 #define RTE_LOGTYPE_L3FWD RTE_LOGTYPE_USER1
 
-#define MAX_PORTS 32
-
 #define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
 #define NB_MBUF   8192
 
@@ -119,7 +117,7 @@
 #define TX_WTHRESH 0  /**< Default values of TX write-back threshold reg. */
 
 #define MAX_PKT_BURST 32
-#define BURST_TX_DRAIN 200000ULL /* around 100us at 2 Ghz */
+#define BURST_TX_DRAIN_US 100 /* TX drain every ~100us */
 
 #define NB_SOCKETS 8
 
@@ -137,7 +135,7 @@ static uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT;
 static uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT;
 
 /* ethernet addresses of ports */
-static struct ether_addr ports_eth_addr[MAX_PORTS];
+static struct ether_addr ports_eth_addr[RTE_MAX_ETHPORTS];
 
 /* mask of enabled ports */
 static uint32_t enabled_port_mask = 0;
@@ -303,7 +301,7 @@ struct lcore_conf {
        uint16_t n_rx_queue;
        struct lcore_rx_queue rx_queue_list[MAX_RX_QUEUE_PER_LCORE];
        uint16_t tx_queue_id;
-       struct mbuf_table tx_mbufs[MAX_PORTS];
+       struct mbuf_table tx_mbufs[RTE_MAX_ETHPORTS];
        lookup_struct_t * lookup_struct;
 } __rte_cache_aligned;
 
@@ -476,7 +474,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, lookup_struct_t * l3fwd
 #endif
 
        dst_port = get_dst_port(ipv4_hdr, portid, l3fwd_lookup_struct);
-       if (dst_port >= MAX_PORTS || (enabled_port_mask & 1 << dst_port) == 0)
+       if (dst_port >= RTE_MAX_ETHPORTS || (enabled_port_mask & 1 << dst_port) == 0)
                dst_port = portid;
 
        /* 02:00:00:00:00:xx */
@@ -502,11 +500,13 @@ main_loop(__attribute__((unused)) void *dummy)
 {
        struct rte_mbuf *pkts_burst[MAX_PKT_BURST];
        unsigned lcore_id;
-       uint64_t prev_tsc = 0;
-       uint64_t diff_tsc, cur_tsc;
+       uint64_t prev_tsc, diff_tsc, cur_tsc;
        int i, j, nb_rx;
        uint8_t portid, queueid;
        struct lcore_conf *qconf;
+       const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) / US_PER_S * BURST_TX_DRAIN_US;
+
+       prev_tsc = 0;
 
        lcore_id = rte_lcore_id();
        qconf = &lcore_conf[lcore_id];
@@ -534,13 +534,13 @@ main_loop(__attribute__((unused)) void *dummy)
                 * TX burst queue drain
                 */
                diff_tsc = cur_tsc - prev_tsc;
-               if (unlikely(diff_tsc > BURST_TX_DRAIN)) {
+               if (unlikely(diff_tsc > drain_tsc)) {
 
                        /*
                         * This could be optimized (use queueid instead of
                         * portid), but it is not called so often
                         */
-                       for (portid = 0; portid < MAX_PORTS; portid++) {
+                       for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++) {
                                if (qconf->tx_mbufs[portid].len == 0)
                                        continue;
                                send_burst(&lcore_conf[lcore_id],
@@ -975,8 +975,8 @@ MAIN(int argc, char **argv)
                rte_exit(EXIT_FAILURE, "Cannot probe PCI\n");
 
        nb_ports = rte_eth_dev_count();
-       if (nb_ports > MAX_PORTS)
-               nb_ports = MAX_PORTS;
+       if (nb_ports > RTE_MAX_ETHPORTS)
+               nb_ports = RTE_MAX_ETHPORTS;
 
        if (check_port_config(nb_ports) < 0)
                rte_exit(EXIT_FAILURE, "check_port_config failed\n");