slstatus/components/netspeeds.c
Laslo Hunhold 68a3902dc5 Increase precision in netspeeds.c
First dividing by interval before multiplying with 1000 decreases the
precision by +-(interval - 1) * 1000, as interval arithmetic always
applies the Gauß-function to the result.

This is not necessary and simply reordering the operations mitigates
this.
2018-05-19 20:14:09 +02:00

127 lines
2.8 KiB
C

/* See LICENSE file for copyright and license details. */
#include <stdio.h>
#include <limits.h>
#include "../util.h"
#if defined(__linux__)
#include <stdint.h>
const char *
netspeed_rx(const char *interface)
{
uint64_t oldrxbytes;
static uint64_t rxbytes = 0;
extern const unsigned int interval;
char path[PATH_MAX];
oldrxbytes = rxbytes;
if (esnprintf(path, sizeof(path),
"/sys/class/net/%s/statistics/rx_bytes",
interface) < 0) {
return NULL;
}
if (pscanf(path, "%llu", &rxbytes) != 1) {
return NULL;
}
return oldrxbytes ? fmt_scaled((rxbytes - oldrxbytes) *
1000 / interval) : NULL;
}
const char *
netspeed_tx(const char *interface)
{
uint64_t oldtxbytes;
static uint64_t txbytes = 0;
extern const unsigned int interval;
char path[PATH_MAX];
oldtxbytes = txbytes;
if (esnprintf(path, sizeof(path),
"/sys/class/net/%s/statistics/tx_bytes",
interface) < 0) {
return NULL;
}
if (pscanf(path, "%llu", &txbytes) != 1) {
return NULL;
}
return oldtxbytes ? fmt_scaled((txbytes - oldtxbytes) *
1000 / interval) : NULL;
}
#elif defined(__OpenBSD__)
#include <string.h>
#include <ifaddrs.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <net/if.h>
const char *
netspeed_rx(const char *interface)
{
struct ifaddrs *ifal, *ifa;
struct if_data *ifd;
uint64_t oldrxbytes;
static uint64_t rxbytes = 0;
extern const unsigned int interval;
int if_ok = 0;
oldrxbytes = rxbytes;
if (getifaddrs(&ifal) == -1) {
warn("getifaddrs failed");
return NULL;
}
rxbytes = 0;
for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
if (!strcmp(ifa->ifa_name, interface) &&
(ifd = (struct if_data *)ifa->ifa_data)) {
rxbytes += ifd->ifi_ibytes, if_ok = 1;
}
}
freeifaddrs(ifal);
if (!if_ok) {
warn("reading 'if_data' failed");
return NULL;
}
return oldrxbytes ? fmt_scaled((rxbytes - oldrxbytes) *
1000 / interval) : NULL;
}
const char *
netspeed_tx(const char *interface)
{
struct ifaddrs *ifal, *ifa;
struct if_data *ifd;
uint64_t oldtxbytes;
static uint64_t txbytes = 0;
extern const unsigned int interval;
int if_ok = 0;
oldtxbytes = txbytes;
if (getifaddrs(&ifal) == -1) {
warn("getifaddrs failed");
return NULL;
}
txbytes = 0;
for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
if (!strcmp(ifa->ifa_name, interface) &&
(ifd = (struct if_data *)ifa->ifa_data)) {
txbytes += ifd->ifi_obytes, if_ok = 1;
}
}
freeifaddrs(ifal);
if (!if_ok) {
warn("reading 'if_data' failed");
return NULL;
}
return oldtxbytes ? fmt_scaled((txbytes - oldtxbytes) *
1000 / interval) : NULL;
}
#endif