From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stephen@networkplumber.org>
Received: from mail-pa0-f51.google.com (mail-pa0-f51.google.com
 [209.85.220.51]) by dpdk.org (Postfix) with ESMTP id B7EBA8E97
 for <dev@dpdk.org>; Fri,  6 Nov 2015 02:04:34 +0100 (CET)
Received: by pabfh17 with SMTP id fh17so103758356pab.0
 for <dev@dpdk.org>; Thu, 05 Nov 2015 17:04:34 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=networkplumber_org.20150623.gappssmtp.com; s=20150623;
 h=from:to:cc:subject:date:message-id:in-reply-to:references;
 bh=GaAqxVDKY5+ejllP05bh2NIJSgUDykVv17S0Q8fSowQ=;
 b=XWY6zSIZ6x73AjRGSOV0uzsSeNHwTOvSE6sV7VqWbTGib7XGBcOEl/0uk/9HEU85Wj
 Jl1mnQlLqd+Wv3pcUqRJsvCVa0rkBOXx4mADaEw32Yb3pWnlcwg6jVyHtpydwKz8r2LA
 /ANm7c92ml0euMIq4MUO9ZXi4hXUOZ8uQhEITEG2OhHq7hzrG/nXNn1mZircCCk5yaUw
 t9a0NzTgkErlnDAniY5IYpjj7HaZ/QXG/vwL9pY/ReAjRoUkpcor3QoIfDQlbUszIaZw
 Aul5hKJmTZHcQWB7X++IV65u10DYdpmeoXq9/gfP0ogldblrKOT/04gHVY77sWB2vVDo
 eeiA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20130820;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references;
 bh=GaAqxVDKY5+ejllP05bh2NIJSgUDykVv17S0Q8fSowQ=;
 b=cYCx4lNDTEJJ2pwvytfthALa0YRJGetKpn725qTOlq8ode8L7Pw9X47a+H30gMpRbF
 dfM4IF5MljE7HmlJyGUPo7EoBO4k/tzFKYkF+Z9jkqiwMN8Q7BBlxK9Ivhl/JM94exZM
 gplVevaSJVAGnI3ENHDWTtY0eQIwN8rhaoZgQpqVw6BLGDN6kdwWvnagrnf8APcMYNDO
 x09BVJe6ZDXpnYLdwNMNew+NAi5I9QSH+Ft/20wP4tRl11dQDAb2JqeerjOalKrPjbwr
 PHQy2ZxeLtn8SMCpOOosfsEtCepp0FjIJuWtKEg+cwt+JP59xidyyEePKfuXVQ2hTXe/
 BSEw==
X-Gm-Message-State: ALoCoQneMtNGE2qkNbtVNc4P8PrEshYzJ1FxQXdlycXSOOZxANErolCxJ0uwheBVlNIldolRCb/U
X-Received: by 10.68.242.105 with SMTP id wp9mr13535439pbc.49.1446771874081;
 Thu, 05 Nov 2015 17:04:34 -0800 (PST)
Received: from xeon-e3.home.lan (static-50-53-82-155.bvtn.or.frontiernet.net.
 [50.53.82.155])
 by smtp.gmail.com with ESMTPSA id qn5sm10105951pac.41.2015.11.05.17.04.33
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
 Thu, 05 Nov 2015 17:04:33 -0800 (PST)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Date: Thu,  5 Nov 2015 17:04:38 -0800
Message-Id: <1446771879-3979-7-git-send-email-stephen@networkplumber.org>
X-Mailer: git-send-email 2.1.4
In-Reply-To: <1446771879-3979-1-git-send-email-stephen@networkplumber.org>
References: <1446771879-3979-1-git-send-email-stephen@networkplumber.org>
Subject: [dpdk-dev] [PATCH 6/7] test-pmd: remove references to deprecated
	statistics
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Nov 2015 01:04:35 -0000

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

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 app/test-pmd/config.c    | 22 ++--------------------
 app/test-pmd/testpmd.c   | 26 ++------------------------
 app/test/test_pmd_perf.c |  7 ++-----
 3 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 938b456..f21801a 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -154,9 +154,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:  "
@@ -167,9 +165,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
@@ -177,12 +173,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++) {
@@ -201,14 +191,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 2e302bb..68e0943 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -751,9 +751,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);
 		}
 
@@ -772,9 +770,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);
 		}
@@ -785,15 +781,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",
@@ -802,11 +789,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");
@@ -1150,10 +1132,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 1fd6843..cd18613 100644
--- 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);
-- 
2.1.4