zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-07-12 12:14:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix integer sizing issues in the NetworkIO Meter

Browse Source 
On Linux kernels the size of the values exported for network
device bytes and packets has used a 64 bit integer for quite
some time (2.6+ IIRC).  Make the procfs value extraction use
correct types and change internal types used to rate convert
these counters (within the NetworkIO Meter) 64 bit integers,
where appropriate.
This commit is contained in:
Nathan Scott
2021-03-01 11:55:15 +11:00
parent 379421d3b2
commit 2d1839289e
16 changed files with 85 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
freebsd/Platform.c
View File

@ -315,24 +315,18 @@ bool Platform_getDiskIO(DiskIOData* data) {
return true;
}
bool Platform_getNetworkIO(unsigned long int* bytesReceived,
unsigned long int* packetsReceived,
unsigned long int* bytesTransmitted,
unsigned long int* packetsTransmitted) {
int r;
bool Platform_getNetworkIO(NetworkIOData* data) {
// get number of interfaces
int count;
size_t countLen = sizeof(count);
const int countMib[] = { CTL_NET, PF_LINK, NETLINK_GENERIC, IFMIB_SYSTEM, IFMIB_IFCOUNT };
int r;
r = sysctl(countMib, ARRAYSIZE(countMib), &count, &countLen, NULL, 0);
if (r < 0)
return false;
unsigned long int bytesReceivedSum = 0, packetsReceivedSum = 0, bytesTransmittedSum = 0, packetsTransmittedSum = 0;
memset(data, 0, sizeof(NetworkIOData));
for (int i = 1; i <= count; i++) {
struct ifmibdata ifmd;
size_t ifmdLen = sizeof(ifmd);
@ -346,16 +340,12 @@ bool Platform_getNetworkIO(unsigned long int* bytesReceived,
if (ifmd.ifmd_flags & IFF_LOOPBACK)
continue;
bytesReceivedSum += ifmd.ifmd_data.ifi_ibytes;
packetsReceivedSum += ifmd.ifmd_data.ifi_ipackets;
bytesTransmittedSum += ifmd.ifmd_data.ifi_obytes;
packetsTransmittedSum += ifmd.ifmd_data.ifi_opackets;
data->bytesReceived += ifmd.ifmd_data.ifi_ibytes;
data->packetsReceived += ifmd.ifmd_data.ifi_ipackets;
data->bytesTransmitted += ifmd.ifmd_data.ifi_obytes;
data->packetsTransmitted += ifmd.ifmd_data.ifi_opackets;
}
*bytesReceived = bytesReceivedSum;
*packetsReceived = packetsReceivedSum;
*bytesTransmitted = bytesTransmittedSum;
*packetsTransmitted = packetsTransmittedSum;
return true;
}