fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-31 18:13:38 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

NetIO: improve performance

Browse Source
This commit is contained in:
李通洲
2023-09-27 10:13:59 +08:00
committed by 李通洲
parent 154657b455
commit 5e5c0b4a58
9 changed files with 110 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/netif/netif.c
+20 -25
View File
@@ -1,35 +1,30 @@
#include "netif.h"
#ifndef _WIN32
#include <net/if.h>
bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1]);
const char* ffNetifGetDefaultRoute()
{
static char iface[IF_NAMESIZE + 1];
if (*(uint16_t*) iface == 0)
{
if (!ffNetifGetDefaultRouteImpl(iface))
iface[1] = 1;
}
return iface;
}
#include <net/if.h>
#else
bool ffNetifGetDefaultRouteImpl(uint32_t* ifIndex);
#define IF_NAMESIZE 16
#endif
uint32_t ffNetifGetDefaultRoute()
bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex);
enum { IF_INDEX_UNINITIALIZED = (uint32_t) -1, IF_INDEX_INVALID = (uint32_t) -2 };
static uint32_t ifIndex = IF_INDEX_UNINITIALIZED;
static char ifName[IF_NAMESIZE + 1];
static inline void init()
{
static uint32_t ifIndex = (uint32_t) -1;
if (ifIndex == (uint32_t) IF_INDEX_UNINITIALIZED && !ffNetifGetDefaultRouteImpl(ifName, &ifIndex))
ifIndex = (uint32_t) IF_INDEX_INVALID;
}
if (ifIndex == (uint32_t) -1)
{
if (!ffNetifGetDefaultRouteImpl(&ifIndex))
ifIndex = (uint32_t) -2;
}
const char* ffNetifGetDefaultRouteIfName()
{
init();
return ifName;
}
uint32_t ffNetifGetDefaultRouteIfIndex()
{
init();
return ifIndex;
}
#endif
src/common/netif/netif.h
+3 -3
View File
@@ -3,7 +3,7 @@
#include "fastfetch.h"
#ifndef _WIN32
const char* ffNetifGetDefaultRoute();
#else
uint32_t ffNetifGetDefaultRoute();
const char* ffNetifGetDefaultRouteIfName();
#endif
uint32_t ffNetifGetDefaultRouteIfIndex();
src/common/netif/netif_bsd.c
+2 -1
View File
@@ -39,7 +39,7 @@ get_rt_address(struct rt_msghdr *rtm, int desired)
return NULL;
}
bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1])
bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex)
{
//https://github.com/hashPirate/copenheimer-masscan-fork/blob/36f1ed9f7b751a7dccd5ed27874e2e703db7d481/src/rawsock-getif.c#L104
@@ -88,6 +88,7 @@ bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1])
assert(sdl->sdl_nlen <= IF_NAMESIZE);
memcpy(iface, sdl->sdl_data, sdl->sdl_nlen);
iface[sdl->sdl_nlen] = '\0';
*ifIndex = sdl->sdl_index;
return true;
}
return false;
src/common/netif/netif_linux.c
+2 -1
View File
@@ -7,7 +7,7 @@
#define FF_STR_INDIR(x) #x
#define FF_STR(x) FF_STR_INDIR(x)
bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1])
bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex)
{
FILE* FF_AUTO_CLOSE_FILE netRoute = fopen("/proc/net/route", "r");
if (!netRoute) return false;
@@ -21,6 +21,7 @@ bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1])
while (fscanf(netRoute, "%" FF_STR(IF_NAMESIZE) "s%llx%*[^\n]", iface, &destination) == 2)
{
if (destination != 0) continue;
*ifIndex = if_nametoindex(iface);
return true;
}
return false;
src/common/netif/netif_windows.c
+1 -1
View File
@@ -3,7 +3,7 @@
#include <iphlpapi.h>
bool ffNetifGetDefaultRouteImpl(uint32_t* ifIndex)
bool ffNetifGetDefaultRouteImpl(char* iface/* unsupported */, uint32_t* ifIndex)
{
ULONG size = 0;
if (GetIpForwardTable(NULL, &size, TRUE) != ERROR_INSUFFICIENT_BUFFER)
src/detection/localip/localip_linux.c
+2 -2
View File
@@ -57,14 +57,14 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
if(getifaddrs(&ifAddrStruct) < 0)
return "getifaddrs(&ifAddrStruct) failed";
const char* defaultRouteIface = ffNetifGetDefaultRoute();
const char* defaultRouteIfName = ffNetifGetDefaultRouteIfName();
for (struct ifaddrs* ifa = ifAddrStruct; ifa; ifa = ifa->ifa_next)
{
if (!ifa->ifa_addr || !(ifa->ifa_flags & IFF_RUNNING))
continue;
bool isDefaultRoute = ffStrEquals(defaultRouteIface, ifa->ifa_name);
bool isDefaultRoute = ffStrEquals(defaultRouteIfName, ifa->ifa_name);
if (options->defaultRouteOnly && !isDefaultRoute)
continue;
src/detection/localip/localip_windows.c
+1 -1
View File
@@ -70,7 +70,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
return "GetAdaptersAddresses() failed";
}
uint32_t defaultRouteIfIndex = ffNetifGetDefaultRoute();
uint32_t defaultRouteIfIndex = ffNetifGetDefaultRouteIfIndex();
// Iterate through all of the adapters
for (IP_ADAPTER_ADDRESSES* adapter = adapter_addresses; adapter; adapter = adapter->Next)
src/detection/netio/netio_bsd.c
+7 -11
View File
@@ -14,15 +14,15 @@
const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options)
{
uint32_t defaultRouteIfIndex = ffNetifGetDefaultRouteIfIndex();
size_t bufSize = 0;
if (sysctl((int[]) { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST2, 0 }, 6, NULL, &bufSize, 0, 0) < 0)
return "sysctl({ CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST2, 0 }, 6, NULL, &bufSize, 0, 0) failed";
if (sysctl((int[]) { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST2, (options->defaultRouteOnly ? (int) defaultRouteIfIndex : 0) }, 6, NULL, &bufSize, 0, 0) < 0)
return "sysctl({ CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST2, ifIndex }, 6, NULL, &bufSize, 0, 0) failed";
FF_AUTO_FREE struct if_msghdr2* buf = (struct if_msghdr2*) malloc(bufSize);
if (sysctl((int[]) { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST2, 0 }, 6, buf, &bufSize, 0, 0) < 0)
return "sysctl({ CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST2, 0 }, 6, buf, &bufSize, 0, 0) failed";
const char* defaultRouteIface = ffNetifGetDefaultRoute();
if (sysctl((int[]) { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST2, (options->defaultRouteOnly ? (int) defaultRouteIfIndex : 0) }, 6, buf, &bufSize, 0, 0) < 0)
return "sysctl({ CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST2, ifIndex }, 6, buf, &bufSize, 0, 0) failed";
for (struct if_msghdr2* ifm = buf;
ifm < (struct if_msghdr2*) ((uint8_t*) buf + bufSize);
@@ -36,10 +36,6 @@ const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options)
sdl->sdl_data[sdl->sdl_nlen] = 0;
bool isDefaultRoute = ffStrEquals(sdl->sdl_data, defaultRouteIface);
if(options->defaultRouteOnly && !isDefaultRoute)
continue;
if (options->namePrefix.length && strncmp(sdl->sdl_data, options->namePrefix.chars, options->namePrefix.length) != 0)
continue;
@@ -54,7 +50,7 @@ const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options)
.rxErrors = ifm->ifm_data.ifi_ierrors,
.txDrops = 0, // unsupported
.rxDrops = ifm->ifm_data.ifi_iqdrops,
.defaultRoute = isDefaultRoute,
.defaultRoute = sdl->sdl_index == defaultRouteIfIndex,
};
}
src/detection/netio/netio_linux.c
+72 -60
View File
@@ -6,6 +6,60 @@
#include <net/if.h>
static void getData(FFstrbuf* buffer, const char* ifName, bool isDefaultRoute, FFstrbuf* path, FFlist* result)
{
ffStrbufSetF(path, "/sys/class/net/%s/operstate", ifName);
if(!ffReadFileBuffer(path->chars, buffer) || !ffStrbufEqualS(buffer, "up"))
return;
FFNetIOResult* counters = (FFNetIOResult*) ffListAdd(result);
ffStrbufInitS(&counters->name, ifName);
counters->defaultRoute = isDefaultRoute;
ffStrbufSetF(path, "/sys/class/net/%s/statistics/", ifName);
uint32_t statLen = path->length;
ffStrbufAppendS(path, "rx_bytes");
if (ffReadFileBuffer(path->chars, buffer))
counters->rxBytes = ffStrbufToUInt(buffer, 0);
ffStrbufSubstrBefore(path, statLen);
ffStrbufAppendS(path, "tx_bytes");
if (ffReadFileBuffer(path->chars, buffer))
counters->txBytes = ffStrbufToUInt(buffer, 0);
ffStrbufSubstrBefore(path, statLen);
ffStrbufAppendS(path, "rx_packets");
if (ffReadFileBuffer(path->chars, buffer))
counters->rxPackets = ffStrbufToUInt(buffer, 0);
ffStrbufSubstrBefore(path, statLen);
ffStrbufAppendS(path, "tx_packets");
if (ffReadFileBuffer(path->chars, buffer))
counters->txPackets = ffStrbufToUInt(buffer, 0);
ffStrbufSubstrBefore(path, statLen);
ffStrbufAppendS(path, "rx_errors");
if (ffReadFileBuffer(path->chars, buffer))
counters->rxErrors = ffStrbufToUInt(buffer, 0);
ffStrbufSubstrBefore(path, statLen);
ffStrbufAppendS(path, "tx_errors");
if (ffReadFileBuffer(path->chars, buffer))
counters->txErrors = ffStrbufToUInt(buffer, 0);
ffStrbufSubstrBefore(path, statLen);
ffStrbufAppendS(path, "rx_dropped");
if (ffReadFileBuffer(path->chars, buffer))
counters->rxDrops = ffStrbufToUInt(buffer, 0);
ffStrbufSubstrBefore(path, statLen);
ffStrbufAppendS(path, "tx_dropped");
if (ffReadFileBuffer(path->chars, buffer))
counters->txDrops = ffStrbufToUInt(buffer, 0);
ffStrbufSubstrBefore(path, statLen);
}
const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options)
{
FF_AUTO_CLOSE_DIR DIR* dirp = opendir("/sys/class/net");
@@ -14,71 +68,29 @@ const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options)
FF_STRBUF_AUTO_DESTROY path = ffStrbufCreateA(64);
FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
const char* defaultRouteIface = ffNetifGetDefaultRoute();
const char* defaultRouteIfName = ffNetifGetDefaultRouteIfName();
struct dirent* entry;
while((entry = readdir(dirp)) != NULL)
if (options->defaultRouteOnly)
{
if(entry->d_name[0] == '.')
continue;
if (options->namePrefix.length && strncmp(defaultRouteIfName, options->namePrefix.chars, options->namePrefix.length) != 0)
return NULL;
bool isDefaultRoute = ffStrEquals(entry->d_name, defaultRouteIface);
if(options->defaultRouteOnly && !isDefaultRoute)
continue;
getData(&buffer, defaultRouteIfName, true, &path, result);
}
else
{
struct dirent* entry;
while((entry = readdir(dirp)) != NULL)
{
const char* ifName = entry->d_name;
if(ifName[0] == '.')
continue;
if (options->namePrefix.length && strncmp(entry->d_name, options->namePrefix.chars, options->namePrefix.length) != 0)
continue;
if (options->namePrefix.length && strncmp(ifName, options->namePrefix.chars, options->namePrefix.length) != 0)
continue;
ffStrbufSetF(&path, "/sys/class/net/%s/operstate", entry->d_name);
if(!ffReadFileBuffer(path.chars, &buffer) || !ffStrbufEqualS(&buffer, "up"))
continue;
FFNetIOResult* counters = (FFNetIOResult*) ffListAdd(result);
ffStrbufInitS(&counters->name, entry->d_name);
counters->defaultRoute = isDefaultRoute;
ffStrbufSetF(&path, "/sys/class/net/%s/statistics/", entry->d_name);
uint32_t statLen = path.length;
ffStrbufAppendS(&path, "rx_bytes");
if (ffReadFileBuffer(path.chars, &buffer))
counters->rxBytes = ffStrbufToUInt(&buffer, 0);
ffStrbufSubstrBefore(&path, statLen);
ffStrbufAppendS(&path, "tx_bytes");
if (ffReadFileBuffer(path.chars, &buffer))
counters->txBytes = ffStrbufToUInt(&buffer, 0);
ffStrbufSubstrBefore(&path, statLen);
ffStrbufAppendS(&path, "rx_packets");
if (ffReadFileBuffer(path.chars, &buffer))
counters->rxPackets = ffStrbufToUInt(&buffer, 0);
ffStrbufSubstrBefore(&path, statLen);
ffStrbufAppendS(&path, "tx_packets");
if (ffReadFileBuffer(path.chars, &buffer))
counters->txPackets = ffStrbufToUInt(&buffer, 0);
ffStrbufSubstrBefore(&path, statLen);
ffStrbufAppendS(&path, "rx_errors");
if (ffReadFileBuffer(path.chars, &buffer))
counters->rxErrors = ffStrbufToUInt(&buffer, 0);
ffStrbufSubstrBefore(&path, statLen);
ffStrbufAppendS(&path, "tx_errors");
if (ffReadFileBuffer(path.chars, &buffer))
counters->txErrors = ffStrbufToUInt(&buffer, 0);
ffStrbufSubstrBefore(&path, statLen);
ffStrbufAppendS(&path, "rx_dropped");
if (ffReadFileBuffer(path.chars, &buffer))
counters->rxDrops = ffStrbufToUInt(&buffer, 0);
ffStrbufSubstrBefore(&path, statLen);
ffStrbufAppendS(&path, "tx_dropped");
if (ffReadFileBuffer(path.chars, &buffer))
counters->txDrops = ffStrbufToUInt(&buffer, 0);
ffStrbufSubstrBefore(&path, statLen);
getData(&buffer, ifName, ffStrEquals(ifName, defaultRouteIfName), &path, result);
}
}
return NULL;