diff options
author | Matias Elo <matias.elo@nokia.com> | 2021-04-26 10:50:43 +0300 |
---|---|---|
committer | Matias Elo <matias.elo@nokia.com> | 2021-05-05 16:59:50 +0300 |
commit | 8b601af93bf948ca3156c30518f34c09e17c4798 (patch) | |
tree | fc0463729236d03e107890fe8734b843e4d0b8b8 | |
parent | 17e83673bfa2705cc748f21ea5265f5b7ae7239a (diff) |
api: pktio: statistics: deprecate odp_pktio_stats_t.in_unknown_protos field
Deprecate odp_pktio_stats_t.in_unknown_protos statistics counter.
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>
Reviewed-by: Jere Leppänen <jere.leppanen@nokia.com>
Reviewed-by: Jerin Jacob <jerinj@marvell.com>
Reviewed-by: Yuri Tolstov <ytolstov@marvell.com>
-rw-r--r-- | include/odp/api/spec/packet_io_stats.h | 6 | ||||
-rw-r--r-- | platform/linux-generic/pktio/stats/packet_io_stats.c | 4 | ||||
-rw-r--r-- | platform/linux-generic/pktio/stats/sysfs_stats.c | 2 | ||||
-rw-r--r-- | test/validation/api/pktio/pktio.c | 3 |
4 files changed, 8 insertions, 7 deletions
diff --git a/include/odp/api/spec/packet_io_stats.h b/include/odp/api/spec/packet_io_stats.h index be841c83f..b723c22d5 100644 --- a/include/odp/api/spec/packet_io_stats.h +++ b/include/odp/api/spec/packet_io_stats.h @@ -19,6 +19,8 @@ extern "C" { #endif +#include <odp/api/deprecated.h> + /** @addtogroup odp_packet_io * @{ */ @@ -71,8 +73,10 @@ typedef struct odp_pktio_stats_t { * because of an unknown or unsupported protocol. For any interface * that does not support protocol multiplexing, this counter will always * be 0. See ifInUnknownProtos in RFC 2863, RFC 3635. + * + * @deprecated This counter has been deprecated. */ - uint64_t in_unknown_protos; + uint64_t ODP_DEPRECATE(in_unknown_protos); /** * The number of octets transmitted in valid MAC frames on this diff --git a/platform/linux-generic/pktio/stats/packet_io_stats.c b/platform/linux-generic/pktio/stats/packet_io_stats.c index b79cf17aa..60a0fc48a 100644 --- a/platform/linux-generic/pktio/stats/packet_io_stats.c +++ b/platform/linux-generic/pktio/stats/packet_io_stats.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <odp/api/deprecated.h> #include <odp_packet_io_stats.h> #include <odp_ethtool_stats.h> #include <odp_sysfs_stats.h> @@ -67,9 +68,10 @@ int _odp_sock_stats_fd(pktio_entry_t *pktio_entry, pktio_entry->s.stats.in_discards; stats->in_errors = cur_stats.in_errors - pktio_entry->s.stats.in_errors; +#if ODP_DEPRECATED_API stats->in_unknown_protos = cur_stats.in_unknown_protos - pktio_entry->s.stats.in_unknown_protos; - +#endif stats->out_octets = cur_stats.out_octets - pktio_entry->s.stats.out_octets; stats->out_ucast_pkts = cur_stats.out_ucast_pkts - diff --git a/platform/linux-generic/pktio/stats/sysfs_stats.c b/platform/linux-generic/pktio/stats/sysfs_stats.c index 45e005c74..4182d1d06 100644 --- a/platform/linux-generic/pktio/stats/sysfs_stats.c +++ b/platform/linux-generic/pktio/stats/sysfs_stats.c @@ -60,8 +60,6 @@ int _odp_sysfs_stats(pktio_entry_t *pktio_entry, sprintf(fname, "/sys/class/net/%s/statistics/rx_errors", dev); ret -= sysfs_get_val(fname, &stats->in_errors); - /* stats->in_unknown_protos is not supported in sysfs */ - sprintf(fname, "/sys/class/net/%s/statistics/tx_bytes", dev); ret -= sysfs_get_val(fname, &stats->out_octets); diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index da87c7ebc..78410023a 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -1945,7 +1945,6 @@ static void _print_pktio_stats(odp_pktio_stats_t *s, const char *name) " in_ucast_pkts %" PRIu64 "\n" " in_discards %" PRIu64 "\n" " in_errors %" PRIu64 "\n" - " in_unknown_protos %" PRIu64 "\n" " out_octets %" PRIu64 "\n" " out_ucast_pkts %" PRIu64 "\n" " out_discards %" PRIu64 "\n" @@ -1955,7 +1954,6 @@ static void _print_pktio_stats(odp_pktio_stats_t *s, const char *name) s->in_ucast_pkts, s->in_discards, s->in_errors, - s->in_unknown_protos, s->out_octets, s->out_ucast_pkts, s->out_discards, @@ -2080,7 +2078,6 @@ static void pktio_test_statistics_counters(void) CU_ASSERT(0 == stats[0].in_discards); CU_ASSERT(0 == stats[0].in_errors); - CU_ASSERT(0 == stats[0].in_unknown_protos); CU_ASSERT(0 == stats[0].out_discards); CU_ASSERT(0 == stats[0].out_errors); |