sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

If CONFIG_NETDEV_STATISTICS=y, then ifconfig will now print network driver statistics

Browse Source
This commit is contained in:
Gregory Nutt 2015-11-26 14:43:34 -06:00
parent d3e08fa378
commit 981e74b810
2 changed files with 88 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.txt
View File

@ -1464,4 +1464,6 @@
* apps/nshlib: NSH no longer calls losetup() and loteardown directly. * apps/nshlib: NSH no longer calls losetup() and loteardown directly.
Now it opens /dev/loop and accomplishes these things using ioctl() Now it opens /dev/loop and accomplishes these things using ioctl()
calls (2015-11-25). calls (2015-11-25).
* apps/nshlib: If CONFIG_NETDEV_STATISTICS=y, then print the network
driver statistics in the ifconfig (15-11-26).

86
nshlib/nsh_netcmds.c
View File

@ -460,6 +460,88 @@ static inline void net_statistics(FAR struct nsh_vtbl_s *vtbl)
# define net_statistics(vtbl) # define net_statistics(vtbl)
#endif #endif
/****************************************************************************
* Name: net_statistics
****************************************************************************/
#if defined(CONFIG_NETDEV_STATISTICS) && !defined(CONFIG_NSH_DISABLE_IFCONFIG)
static inline void netdev_statistics(FAR struct nsh_vtbl_s *vtbl,
FAR struct net_driver_s *dev)
{
FAR struct netdev_statistics_s *stats = &dev->d_statistics;
FAR char *fmt;
/* Rx Statistics */
nsh_output(vtbl, "\tRX: %-8s %-8s %-8s\n",
"RECEIVED", "FRAGMENT", "ERRORS");
nsh_output(vtbl, "\t %08lx %08lx %08lx\n",
(unsigned long)stats->rx_packets,
(unsigned long)stats->rx_fragments,
(unsigned long)stats->rx_errors);
fmt = "\t "
#ifdef CONFIG_NET_IPv4
"%-8s "
#endif
#ifdef CONFIG_NET_IPv6
"%-8s "
#endif
#ifdef CONFIG_NET_ARP
"%-8s "
#endif
"%-8s\n";
nsh_output(vtbl, fmt
#ifdef CONFIG_NET_IPv4
, "IPv4"
#endif
#ifdef CONFIG_NET_IPv6
, "IPv6"
#endif
#ifdef CONFIG_NET_ARP
, "ARP"
#endif
, "DROPPED");
fmt = "\t "
#ifdef CONFIG_NET_IPv4
"%08lx "
#endif
#ifdef CONFIG_NET_IPv6
"%08lx "
#endif
#ifdef CONFIG_NET_ARP
"%08lx "
#endif
"%08lx\n";
nsh_output(vtbl, fmt
#ifdef CONFIG_NET_IPv4
, (unsigned long)stats->rx_ipv4
#endif
#ifdef CONFIG_NET_IPv6
, (unsigned long)stats->rx_ipv6
#endif
#ifdef CONFIG_NET_ARP
, (unsigned long)stats->rx_arp
#endif
, (unsigned long)stats->rx_dropped);
nsh_output(vtbl, "\tTX: %-8s %-8s %-8s %-8s\n",
"QUEUED", "SENT", "ERRORS", "TIMEOUTS");
nsh_output(vtbl, "\t %08lx %08lx %08lx %08lx\n",
(unsigned long)stats->tx_packets,
(unsigned long)stats->tx_done,
(unsigned long)stats->tx_errors,
(unsigned long)stats->tx_timeouts);
nsh_output(vtbl, "\tTOTAL ERRORS: %08x\n\n",
(unsigned long)stats->errors);
}
#else
# define netdev_statistics(vtbl,dev)
#endif
/**************************************************************************** /****************************************************************************
* Name: ifconfig_callback * Name: ifconfig_callback
****************************************************************************/ ****************************************************************************/
@ -610,6 +692,10 @@ static int ifconfig_callback(FAR struct net_driver_s *dev, void *arg)
#endif #endif
nsh_output(vtbl, "\n"); nsh_output(vtbl, "\n");
/* Show driver statistics */
netdev_statistics(vtbl, dev);
return OK; return OK;
} }
#endif /* !CONFIG_NSH_DISABLE_IFUPDOWN || !CONFIG_NSH_DISABLE_IFCONFIG */ #endif /* !CONFIG_NSH_DISABLE_IFUPDOWN || !CONFIG_NSH_DISABLE_IFCONFIG */