matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iplink: display rx nohandler stats 

Support for the new rx_nohandler statistic.
This code is designed to handle the case where the kernel reported statistic
structure is smaller than the larger structure in later releases (and vice versa).

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2016-02-09 11:13:31 -08:00
parent 655235754a
commit 07ec183418
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ip/ipaddress.c
View File

@ -481,7 +481,8 @@ static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s,
/* RX error stats */ /* RX error stats */
if (show_stats > 1) { if (show_stats > 1) {
fprintf(fp, "%s", _SL_); fprintf(fp, "%s", _SL_);
fprintf(fp, " RX errors: length crc frame fifo missed%s", _SL_); fprintf(fp, " RX errors: length crc frame fifo missed%s%s",
s->rx_nohandler ? " nohandler" : "", _SL_);
fprintf(fp, " "); fprintf(fp, " ");
print_num(fp, 8, s->rx_length_errors); print_num(fp, 8, s->rx_length_errors);
@ -489,6 +490,9 @@ static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s,
print_num(fp, 7, s->rx_frame_errors); print_num(fp, 7, s->rx_frame_errors);
print_num(fp, 7, s->rx_fifo_errors); print_num(fp, 7, s->rx_fifo_errors);
print_num(fp, 7, s->rx_missed_errors); print_num(fp, 7, s->rx_missed_errors);
if (s->rx_nohandler)
print_num(fp, 7, s->rx_nohandler);
} }
fprintf(fp, "%s", _SL_); fprintf(fp, "%s", _SL_);
@ -496,7 +500,6 @@ static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s,
fprintf(fp, " TX: bytes packets errors dropped carrier collsns %s%s", fprintf(fp, " TX: bytes packets errors dropped carrier collsns %s%s",
s->tx_compressed ? "compressed" : "", _SL_); s->tx_compressed ? "compressed" : "", _SL_);
fprintf(fp, " "); fprintf(fp, " ");
print_num(fp, 10, s->tx_bytes); print_num(fp, 10, s->tx_bytes);
print_num(fp, 8, s->tx_packets); print_num(fp, 8, s->tx_packets);
@ -546,13 +549,16 @@ static void print_link_stats32(FILE *fp, const struct rtnl_link_stats *s,
/* RX error stats */ /* RX error stats */
if (show_stats > 1) { if (show_stats > 1) {
fprintf(fp, "%s", _SL_); fprintf(fp, "%s", _SL_);
fprintf(fp, " RX errors: length crc frame fifo missed%s", _SL_); fprintf(fp, " RX errors: length crc frame fifo missed%s%s",
s->rx_nohandler ? " nohandler" : "", _SL_);
fprintf(fp, " "); fprintf(fp, " ");
print_num(fp, 8, s->rx_length_errors); print_num(fp, 8, s->rx_length_errors);
print_num(fp, 7, s->rx_crc_errors); print_num(fp, 7, s->rx_crc_errors);
print_num(fp, 7, s->rx_frame_errors); print_num(fp, 7, s->rx_frame_errors);
print_num(fp, 7, s->rx_fifo_errors); print_num(fp, 7, s->rx_fifo_errors);
print_num(fp, 7, s->rx_missed_errors); print_num(fp, 7, s->rx_missed_errors);
if (s->rx_nohandler)
print_num(fp, 7, s->rx_nohandler);
} }
fprintf(fp, "%s", _SL_); fprintf(fp, "%s", _SL_);
@ -590,12 +596,23 @@ static void print_link_stats32(FILE *fp, const struct rtnl_link_stats *s,
static void __print_link_stats(FILE *fp, struct rtattr **tb) static void __print_link_stats(FILE *fp, struct rtattr **tb)
{ {
if (tb[IFLA_STATS64]) const struct rtattr *carrier_changes = tb[IFLA_CARRIER_CHANGES];
print_link_stats64(fp, RTA_DATA(tb[IFLA_STATS64]),
tb[IFLA_CARRIER_CHANGES]); if (tb[IFLA_STATS64]) {
else if (tb[IFLA_STATS]) struct rtnl_link_stats64 stats = { 0 };
print_link_stats32(fp, RTA_DATA(tb[IFLA_STATS]),
tb[IFLA_CARRIER_CHANGES]); memcpy(&stats, RTA_DATA(tb[IFLA_STATS64]),
MIN(RTA_PAYLOAD(tb[IFLA_STATS64]), sizeof(stats)));
print_link_stats64(fp, &stats, carrier_changes);
} else if (tb[IFLA_STATS]) {
struct rtnl_link_stats stats = { 0 };
memcpy(&stats, RTA_DATA(tb[IFLA_STATS]),
MIN(RTA_PAYLOAD(tb[IFLA_STATS]), sizeof(stats)));
print_link_stats32(fp, &stats, carrier_changes);
}
} }
static void print_link_stats(FILE *fp, struct nlmsghdr *n) static void print_link_stats(FILE *fp, struct nlmsghdr *n)