app/testpmd: remove references to deprecated statistics

Some of the statistics are deprecated, so don't test them.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index df6cd9e..e2030b0 100644 (file)
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -172,9 +172,7 @@ nic_stats_display(portid_t port_id)
                printf("  RX-packets: %-10"PRIu64" RX-missed: %-10"PRIu64" RX-bytes:  "
                       "%-"PRIu64"\n",
                       stats.ipackets, stats.imissed, stats.ibytes);
-               printf("  RX-badcrc:  %-10"PRIu64" RX-badlen: %-10"PRIu64" RX-errors: "
-                      "%-"PRIu64"\n",
-                      stats.ibadcrc, stats.ibadlen, stats.ierrors);
+               printf("  RX-errors: %-"PRIu64"\n", stats.ierrors);
                printf("  RX-nombuf:  %-10"PRIu64"\n",
                       stats.rx_nombuf);
                printf("  TX-packets: %-10"PRIu64" TX-errors: %-10"PRIu64" TX-bytes:  "
@@ -185,9 +183,7 @@ nic_stats_display(portid_t port_id)
                printf("  RX-packets:              %10"PRIu64"    RX-errors: %10"PRIu64
                       "    RX-bytes: %10"PRIu64"\n",
                       stats.ipackets, stats.ierrors, stats.ibytes);
-               printf("  RX-badcrc:               %10"PRIu64"    RX-badlen: %10"PRIu64
-                      "  RX-errors:  %10"PRIu64"\n",
-                      stats.ibadcrc, stats.ibadlen, stats.ierrors);
+               printf("  RX-errors:  %10"PRIu64"\n", stats.ierrors);
                printf("  RX-nombuf:               %10"PRIu64"\n",
                       stats.rx_nombuf);
                printf("  TX-packets:              %10"PRIu64"    TX-errors: %10"PRIu64
@@ -195,12 +191,6 @@ nic_stats_display(portid_t port_id)
                       stats.opackets, stats.oerrors, stats.obytes);
        }
 
-       /* stats fdir */
-       if (fdir_conf.mode != RTE_FDIR_MODE_NONE)
-               printf("  Fdirmiss:   %-10"PRIu64" Fdirmatch: %-10"PRIu64"\n",
-                      stats.fdirmiss,
-                      stats.fdirmatch);
-
        if (port->rx_queue_stats_mapping_enabled) {
                printf("\n");
                for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS; i++) {
@@ -219,14 +209,6 @@ nic_stats_display(portid_t port_id)
                }
        }
 
-       /* Display statistics of XON/XOFF pause frames, if any. */
-       if ((stats.tx_pause_xon  | stats.rx_pause_xon |
-            stats.tx_pause_xoff | stats.rx_pause_xoff) > 0) {
-               printf("  RX-XOFF:    %-10"PRIu64" RX-XON:    %-10"PRIu64"\n",
-                      stats.rx_pause_xoff, stats.rx_pause_xon);
-               printf("  TX-XOFF:    %-10"PRIu64" TX-XON:    %-10"PRIu64"\n",
-                      stats.tx_pause_xoff, stats.tx_pause_xon);
-       }
        printf("  %s############################%s\n",
               nic_stats_border, nic_stats_border);
 }

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 1ee935b..093952f 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -754,9 +754,7 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
                        printf("  Bad-ipcsum: %-14"PRIu64" Bad-l4csum: %-14"PRIu64" \n",
                               port->rx_bad_ip_csum, port->rx_bad_l4_csum);
                if (((stats->ierrors - stats->imissed) + stats->rx_nombuf) > 0) {
-                       printf("  RX-badcrc:  %-14"PRIu64" RX-badlen:  %-14"PRIu64
-                              "RX-error: %-"PRIu64"\n",
-                              stats->ibadcrc, stats->ibadlen, stats->ierrors);
+                       printf("  RX-error: %-"PRIu64"\n",  stats->ierrors);
                        printf("  RX-nombufs: %-14"PRIu64"\n", stats->rx_nombuf);
                }
 
@@ -775,9 +773,7 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
                        printf("  Bad-ipcsum:%14"PRIu64"    Bad-l4csum:%14"PRIu64"\n",
                               port->rx_bad_ip_csum, port->rx_bad_l4_csum);
                if (((stats->ierrors - stats->imissed) + stats->rx_nombuf) > 0) {
-                       printf("  RX-badcrc:              %14"PRIu64"    RX-badlen: %14"PRIu64
-                              "    RX-error:%"PRIu64"\n",
-                              stats->ibadcrc, stats->ibadlen, stats->ierrors);
+                       printf("  RX-error:%"PRIu64"\n", stats->ierrors);
                        printf("  RX-nombufs:             %14"PRIu64"\n",
                               stats->rx_nombuf);
                }
@@ -788,15 +784,6 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
                       (uint64_t) (stats->opackets + port->tx_dropped));
        }
 
-       /* Display statistics of XON/XOFF pause frames, if any. */
-       if ((stats->tx_pause_xon  | stats->rx_pause_xon |
-            stats->tx_pause_xoff | stats->rx_pause_xoff) > 0) {
-               printf("  RX-XOFF:    %-14"PRIu64" RX-XON:     %-14"PRIu64"\n",
-                      stats->rx_pause_xoff, stats->rx_pause_xon);
-               printf("  TX-XOFF:    %-14"PRIu64" TX-XON:     %-14"PRIu64"\n",
-                      stats->tx_pause_xoff, stats->tx_pause_xon);
-       }
-
 #ifdef RTE_TEST_PMD_RECORD_BURST_STATS
        if (port->rx_stream)
                pkt_burst_stats_display("RX",
@@ -805,11 +792,6 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
                pkt_burst_stats_display("TX",
                        &port->tx_stream->tx_burst_stats);
 #endif
-       /* stats fdir */
-       if (fdir_conf.mode != RTE_FDIR_MODE_NONE)
-               printf("  Fdirmiss:%14"PRIu64"    Fdirmatch:%14"PRIu64"\n",
-                      stats->fdirmiss,
-                      stats->fdirmatch);
 
        if (port->rx_queue_stats_mapping_enabled) {
                printf("\n");
@@ -1153,10 +1135,6 @@ stop_packet_forwarding(void)
                port->stats.oerrors = 0;
                stats.rx_nombuf -= port->stats.rx_nombuf;
                port->stats.rx_nombuf = 0;
-               stats.fdirmatch -= port->stats.fdirmatch;
-               port->stats.rx_nombuf = 0;
-               stats.fdirmiss -= port->stats.fdirmiss;
-               port->stats.rx_nombuf = 0;
 
                total_recv += stats.ipackets;
                total_xmit += stats.opackets;

diff --git a/app/test/test_pmd_perf.c b/app/test/test_pmd_perf.c
index ef9262c..8f55640 100644 (file)
--- a/app/test/test_pmd_perf.c
+++ b/app/test/test_pmd_perf.c
@@ -343,11 +343,8 @@ stats_display(uint8_t port_id)
        printf("  RX-packets: %-10"PRIu64" RX-missed: %-10"PRIu64" RX-bytes:  "
               "%-"PRIu64"\n",
               stats.ipackets, stats.imissed, stats.ibytes);
-       printf("  RX-badcrc:  %-10"PRIu64" RX-badlen: %-10"PRIu64" RX-errors: "
-              "%-"PRIu64"\n",
-              stats.ibadcrc, stats.ibadlen, stats.ierrors);
-       printf("  RX-nombuf:  %-10"PRIu64"\n",
-              stats.rx_nombuf);
+       printf("  RX-errors: %-10"PRIu64" RX-nombuf:  %-10"PRIu64"\n",
+              stats.ierrors, stats.rx_nombuf);
        printf("  TX-packets: %-10"PRIu64" TX-errors: %-10"PRIu64" TX-bytes:  "
               "%-"PRIu64"\n",
               stats.opackets, stats.oerrors, stats.obytes);