From 49f386542af49b6cf5a5e001c3061d3ba92814b0 Mon Sep 17 00:00:00 2001 From: Maryam Tahhan Date: Wed, 15 Jul 2015 14:11:29 +0100 Subject: [PATCH] ethdev: remove driver specific stats Remove non generic stats in rte_stats_strings and mark the relevant fields in struct rte_eth_stats as deprecated. Signed-off-by: Maryam Tahhan Acked-by: Olivier Matz --- doc/guides/rel_notes/abi.rst | 4 ++++ lib/librte_ether/rte_ethdev.c | 9 --------- lib/librte_ether/rte_ethdev.h | 30 ++++++++++++++++++++---------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/doc/guides/rel_notes/abi.rst b/doc/guides/rel_notes/abi.rst index 9e98d6253e..7a088309e0 100644 --- a/doc/guides/rel_notes/abi.rst +++ b/doc/guides/rel_notes/abi.rst @@ -34,3 +34,7 @@ Deprecation Notices creates a dummy/empty malloc library to fulfill binaries with dynamic linking dependencies on librte_malloc.so. Such dummy library will not be created from release 2.2 so binaries will need to be rebuilt. + +* The following fields have been deprecated in rte_eth_stats: + imissed, ibadcrc, ibadlen, imcasts, fdirmatch, fdirmiss, + tx_pause_xon, rx_pause_xon, tx_pause_xoff, rx_pause_xoff diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 6e12a9ad6f..57f841e2ff 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -142,17 +142,8 @@ static const struct rte_eth_xstats_name_off rte_stats_strings[] = { {"rx_bytes", offsetof(struct rte_eth_stats, ibytes)}, {"tx_bytes", offsetof(struct rte_eth_stats, obytes)}, {"tx_errors", offsetof(struct rte_eth_stats, oerrors)}, - {"rx_missed_errors", offsetof(struct rte_eth_stats, imissed)}, - {"rx_crc_errors", offsetof(struct rte_eth_stats, ibadcrc)}, - {"rx_bad_length_errors", offsetof(struct rte_eth_stats, ibadlen)}, {"rx_errors", offsetof(struct rte_eth_stats, ierrors)}, {"alloc_rx_buff_failed", offsetof(struct rte_eth_stats, rx_nombuf)}, - {"fdir_match", offsetof(struct rte_eth_stats, fdirmatch)}, - {"fdir_miss", offsetof(struct rte_eth_stats, fdirmiss)}, - {"tx_flow_control_xon", offsetof(struct rte_eth_stats, tx_pause_xon)}, - {"rx_flow_control_xon", offsetof(struct rte_eth_stats, rx_pause_xon)}, - {"tx_flow_control_xoff", offsetof(struct rte_eth_stats, tx_pause_xoff)}, - {"rx_flow_control_xoff", offsetof(struct rte_eth_stats, rx_pause_xoff)}, }; #define RTE_NB_STATS (sizeof(rte_stats_strings) / sizeof(rte_stats_strings[0])) diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 9b6a812fc8..8f1cf8d84a 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -194,19 +194,29 @@ struct rte_eth_stats { uint64_t opackets; /**< Total number of successfully transmitted packets.*/ uint64_t ibytes; /**< Total number of successfully received bytes. */ uint64_t obytes; /**< Total number of successfully transmitted bytes. */ - uint64_t imissed; /**< Total of RX missed packets (e.g full FIFO). */ - uint64_t ibadcrc; /**< Total of RX packets with CRC error. */ - uint64_t ibadlen; /**< Total of RX packets with bad length. */ + uint64_t imissed; + /**< Deprecated; Total of RX missed packets (e.g full FIFO). */ + uint64_t ibadcrc; + /**< Deprecated; Total of RX packets with CRC error. */ + uint64_t ibadlen; + /**< Deprecated; Total of RX packets with bad length. */ uint64_t ierrors; /**< Total number of erroneous received packets. */ uint64_t oerrors; /**< Total number of failed transmitted packets. */ - uint64_t imcasts; /**< Total number of multicast received packets. */ + uint64_t imcasts; + /**< Deprecated; Total number of multicast received packets. */ uint64_t rx_nombuf; /**< Total number of RX mbuf allocation failures. */ - uint64_t fdirmatch; /**< Total number of RX packets matching a filter. */ - uint64_t fdirmiss; /**< Total number of RX packets not matching any filter. */ - uint64_t tx_pause_xon; /**< Total nb. of XON pause frame sent. */ - uint64_t rx_pause_xon; /**< Total nb. of XON pause frame received. */ - uint64_t tx_pause_xoff; /**< Total nb. of XOFF pause frame sent. */ - uint64_t rx_pause_xoff; /**< Total nb. of XOFF pause frame received. */ + uint64_t fdirmatch; + /**< Deprecated; Total number of RX packets matching a filter. */ + uint64_t fdirmiss; + /**< Deprecated; Total number of RX packets not matching any filter. */ + uint64_t tx_pause_xon; + /**< Deprecated; Total nb. of XON pause frame sent. */ + uint64_t rx_pause_xon; + /**< Deprecated; Total nb. of XON pause frame received. */ + uint64_t tx_pause_xoff; + /**< Deprecated; Total nb. of XOFF pause frame sent. */ + uint64_t rx_pause_xoff; + /**< Deprecated; Total nb. of XOFF pause frame received. */ uint64_t q_ipackets[RTE_ETHDEV_QUEUE_STAT_CNTRS]; /**< Total number of queue RX packets. */ uint64_t q_opackets[RTE_ETHDEV_QUEUE_STAT_CNTRS];