Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-09 23:48:48 +00:00
Code Issues Releases Activity

fix update_diskio() on linux: not all devices were counted before; ignore some virtual devices (LVM, network block devices, RAM disks, loopback)

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@196 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Johannes Winkelmann 2005-08-26 22:15:04 +00:00
parent bdfab6b089
commit c02d7bc18a
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/linux.c
View File

@ -29,6 +29,7 @@
#include <net/if.h> #include <net/if.h>
#include <math.h> #include <math.h>
#include <linux/major.h>
static struct sysinfo s_info; static struct sysinfo s_info;
@ -1093,9 +1094,10 @@ void update_diskio()
static FILE* fp; static FILE* fp;
char buf[512]; char buf[512];
int minor; int major, minor;
unsigned int current = 0; unsigned int current = 0;
unsigned int reads, writes = 0; unsigned int reads, writes = 0;
int col_count = 0;
if (!fp) { if (!fp) {
fp = fopen("/proc/diskstats", "r"); fp = fopen("/proc/diskstats", "r");
@ -1109,9 +1111,16 @@ void update_diskio()
current = 0; current = 0;
while (!feof(fp)) { while (!feof(fp)) {
fgets(buf, 512, fp); fgets(buf, 512, fp);
sscanf(buf, "%*u %u %*s %*u %*u %u %*u %*u %*u %u", col_count = sscanf(buf, "%u %u %*s %*u %*u %u %*u %*u %*u %u",
&minor, &reads, &writes); &major, &minor, &reads, &writes);
if (minor == 0) { /* ignore subdevices (they have only 7 entries in their line)
* and virtual devices (LVM, network block devices, RAM disks, Loopback)
*
* XXX ignore devices which are part of a SW RAID (MD_MAJOR)
*/
if (col_count > 7 &&
major != LVM_BLK_MAJOR && major != NBD_MAJOR &&
major != RAMDISK_MAJOR && major != LOOP_MAJOR) {
current += reads + writes; current += reads + writes;
} }
} }