RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 04:52:59 +01:00
Code Releases Activity

netstats: collect layer 2 netstats in gnrc_netif

Browse Source 
This the first step in moving the collection of layer 2 netstats from
the low level driver to a central location, ie. gnrc_netif, to avoid
code duplication.
This commit is contained in:
smlng 2018-08-17 14:48:54 +02:00
parent 1d693403b6
commit 6d0384f068
8 changed files with 54 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/xbee/gnrc_xbee.c
View File

@ -153,10 +153,10 @@ static int xbee_adpt_send(gnrc_netif_t *netif, gnrc_pktsnip_t *pkt)
#ifdef MODULE_NETSTATS_L2
if (hdr->flags & BCAST) {
netif->dev->stats.tx_mcast_count++;
netif->stats.tx_mcast_count++;
}
else {
netif->dev->stats.tx_unicast_count++;
netif->stats.tx_unicast_count++;
}
#endif
DEBUG("[xbee-gnrc] send: triggering the drivers send function\n");

6
sys/include/net/gnrc/netif.h
View File

@ -47,6 +47,9 @@
#include "net/ndp.h"
#include "net/netdev.h"
#include "net/netopt.h"
#ifdef MODULE_NETSTATS_L2
#include "net/netstats.h"
#endif
#include "rmutex.h"
#ifdef __cplusplus
@ -65,6 +68,9 @@ typedef struct {
const gnrc_netif_ops_t *ops; /**< Operations of the network interface */
netdev_t *dev; /**< Network device of the network interface */
rmutex_t mutex; /**< Mutex of the interface */
#ifdef MODULE_NETSTATS_L2
netstats_t stats; /**< transceiver's statistics */
#endif
#if defined(MODULE_GNRC_IPV6) || DOXYGEN
gnrc_netif_ipv6_t ipv6; /**< IPv6 component */
#endif

4
sys/net/gnrc/link_layer/gomach/gomach_internal.c
View File

@ -103,10 +103,10 @@ int _gnrc_gomach_transmit(gnrc_netif_t *netif, gnrc_pktsnip_t *pkt)
#ifdef MODULE_NETSTATS_L2
if (netif_hdr->flags &
(GNRC_NETIF_HDR_FLAGS_BROADCAST | GNRC_NETIF_HDR_FLAGS_MULTICAST)) {
netif->dev->stats.tx_mcast_count++;
netif->stats.tx_mcast_count++;
}
else {
netif->dev->stats.tx_unicast_count++;
netif->stats.tx_unicast_count++;
}
#endif
#ifdef MODULE_GNRC_MAC

4
sys/net/gnrc/link_layer/lwmac/lwmac_internal.c
View File

@ -90,10 +90,10 @@ int _gnrc_lwmac_transmit(gnrc_netif_t *netif, gnrc_pktsnip_t *pkt)
#ifdef MODULE_NETSTATS_L2
if (netif_hdr->flags &
(GNRC_NETIF_HDR_FLAGS_BROADCAST | GNRC_NETIF_HDR_FLAGS_MULTICAST)) {
netif->dev->stats.tx_mcast_count++;
netif->stats.tx_mcast_count++;
}
else {
netif->dev->stats.tx_unicast_count++;
netif->stats.tx_unicast_count++;
}
#endif
#ifdef MODULE_GNRC_MAC

8
sys/net/gnrc/netif/ethernet/gnrc_netif_ethernet.c
View File

@ -145,10 +145,10 @@ static int _send(gnrc_netif_t *netif, gnrc_pktsnip_t *pkt)
#ifdef MODULE_NETSTATS_L2
if ((netif_hdr->flags & GNRC_NETIF_HDR_FLAGS_BROADCAST) ||
(netif_hdr->flags & GNRC_NETIF_HDR_FLAGS_MULTICAST)) {
dev->stats.tx_mcast_count++;
netif->stats.tx_mcast_count++;
}
else {
dev->stats.tx_unicast_count++;
netif->stats.tx_unicast_count++;
}
#endif
res = dev->driver->send(dev, &iolist);
@ -183,6 +183,10 @@ static gnrc_pktsnip_t *_recv(gnrc_netif_t *netif)
DEBUG("gnrc_netif_ethernet: read error.\n");
goto safe_out;
}
#ifdef MODULE_NETSTATS_L2
netif->stats.rx_count++;
netif->stats.rx_bytes += nread;
#endif
if (nread < bytes_expected) {
/* we've got less than the expected packet size,

32
sys/net/gnrc/netif/gnrc_netif.c
View File

@ -25,7 +25,7 @@
#include "net/gnrc/ipv6/nib.h"
#include "net/gnrc/ipv6.h"
#endif /* MODULE_GNRC_IPV6_NIB */
#ifdef MODULE_NETSTATS_IPV6
#ifdef MODULE_NETSTATS
#include "net/netstats.h"
#endif
#include "fmt.h"
@ -126,6 +126,13 @@ int gnrc_netif_get_from_netdev(gnrc_netif_t *netif, gnrc_netapi_opt_t *opt)
*((netstats_t **)opt->data) = &netif->ipv6.stats;
res = sizeof(&netif->ipv6.stats);
break;
#endif
#ifdef MODULE_NETSTATS_L2
case NETSTATS_LAYER2:
assert(opt->data_len == sizeof(netstats_t *));
*((netstats_t **)opt->data) = &netif->stats;
res = sizeof(&netif->stats);
break;
#endif
default:
/* take from device */
@ -1196,6 +1203,9 @@ static void *_gnrc_netif_thread(void *args)
if (netif->ops->init) {
netif->ops->init(netif);
}
#ifdef MODULE_NETSTATS_L2
memset(&netif->stats, 0, sizeof(netstats_t));
#endif
/* now let rest of GNRC use the interface */
gnrc_netif_release(netif);
@ -1215,6 +1225,11 @@ static void *_gnrc_netif_thread(void *args)
DEBUG("gnrc_netif: error sending packet %p (code: %u)\n",
msg.content.ptr, res);
}
#ifdef MODULE_NETSTATS_L2
else {
netif->stats.tx_bytes += res;
}
#endif
break;
case GNRC_NETAPI_MSG_TYPE_SET:
opt = msg.content.ptr;
@ -1287,25 +1302,24 @@ static void _event_cb(netdev_t *dev, netdev_event_t event)
}
else {
DEBUG("gnrc_netif: event triggered -> %i\n", event);
gnrc_pktsnip_t *pkt = NULL;
switch (event) {
case NETDEV_EVENT_RX_COMPLETE: {
gnrc_pktsnip_t *pkt = netif->ops->recv(netif);
if (pkt) {
_pass_on_packet(pkt);
}
case NETDEV_EVENT_RX_COMPLETE:
pkt = netif->ops->recv(netif);
if (pkt) {
_pass_on_packet(pkt);
}
break;
#ifdef MODULE_NETSTATS_L2
case NETDEV_EVENT_TX_MEDIUM_BUSY:
/* we are the only ones supposed to touch this variable,
* so no acquire necessary */
dev->stats.tx_failed++;
netif->stats.tx_failed++;
break;
case NETDEV_EVENT_TX_COMPLETE:
/* we are the only ones supposed to touch this variable,
* so no acquire necessary */
dev->stats.tx_success++;
netif->stats.tx_success++;
break;
#endif
default:

7
sys/net/gnrc/netif/gnrc_netif_raw.c
View File

@ -70,6 +70,11 @@ static gnrc_pktsnip_t *_recv(gnrc_netif_t *netif)
gnrc_pktbuf_release(pkt);
return NULL;
}
#ifdef MODULE_NETSTATS_L2
netif->stats.rx_count++;
netif->stats.rx_bytes += nread;
#endif
if (nread < bytes_expected) {
/* we've got less then the expected packet size,
* so free the unused space.*/
@ -102,7 +107,7 @@ static int _send(gnrc_netif_t *netif, gnrc_pktsnip_t *pkt)
netdev_t *dev = netif->dev;
#ifdef MODULE_NETSTATS_L2
dev->stats.tx_unicast_count++;
netif->stats.tx_unicast_count++;
#endif
res = dev->driver->send(dev, (iolist_t *)pkt);

9
sys/net/gnrc/netif/ieee802154/gnrc_netif_ieee802154.c
View File

@ -95,6 +95,11 @@ static gnrc_pktsnip_t *_recv(gnrc_netif_t *netif)
gnrc_pktbuf_release(pkt);
return NULL;
}
#ifdef MODULE_NETSTATS_L2
netif->stats.rx_count++;
netif->stats.rx_bytes += nread;
#endif
if (netif->flags & GNRC_NETIF_FLAGS_RAWMODE) {
/* Raw mode, skip packet processing, but provide rx_info via
* GNRC_NETTYPE_NETIF */
@ -241,10 +246,10 @@ static int _send(gnrc_netif_t *netif, gnrc_pktsnip_t *pkt)
#ifdef MODULE_NETSTATS_L2
if (netif_hdr->flags &
(GNRC_NETIF_HDR_FLAGS_BROADCAST | GNRC_NETIF_HDR_FLAGS_MULTICAST)) {
netif->dev->stats.tx_mcast_count++;
netif->stats.tx_mcast_count++;
}
else {
netif->dev->stats.tx_unicast_count++;
netif->stats.tx_unicast_count++;
}
#endif
#ifdef MODULE_GNRC_MAC