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

DiskIO (Linux): better handling virtual devices

Browse Source
This commit is contained in:
李通洲
2023-12-17 12:21:12 +08:00
parent e071a1eeb2
commit 529f94c64a
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/diskio/diskio_linux.c
+10 -13
View File
@@ -19,10 +19,15 @@ const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
if (devName[0] == '.')
continue;
if (ffStrStartsWith(devName, "dm-")) // LVM logical partitions
continue;
char pathSysBlock[PATH_MAX];
snprintf(pathSysBlock, PATH_MAX, "/sys/block/%s", devName);
char pathSysDeviceReal[PATH_MAX] = "";
readlink(pathSysBlock, pathSysDeviceReal, sizeof(pathSysDeviceReal) - 1);
if (strstr(pathSysDeviceReal, "/virtual/")) // virtual device
continue;
snprintf(pathSysBlock, PATH_MAX, "/sys/block/%s/device", devName);
if (!ffPathExists(pathSysBlock, FF_PATHTYPE_DIRECTORY))
@@ -54,17 +59,9 @@ const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
{
ffStrbufInit(&device->interconnect);
snprintf(pathSysBlock, PATH_MAX, "/sys/block/%s", devName);
char pathSysDevices[PATH_MAX];
ssize_t resultLength = readlink(pathSysBlock, pathSysDevices, sizeof(pathSysDevices) - 1);
if (resultLength > 0)
{
pathSysDevices[resultLength] = '\0';
if (strstr(pathSysDevices, "/usb") != NULL)
ffStrbufSetS(&device->interconnect, "usb");
}
if (device->interconnect.length == 0)
if (strstr(pathSysDeviceReal, "/usb") != NULL)
ffStrbufSetS(&device->interconnect, "usb");
else
{
snprintf(pathSysBlock, PATH_MAX, "/sys/block/%s/device/transport", devName);
ffAppendFileBuffer(pathSysBlock, &device->interconnect);