Skip to content

Get data from all block devices not just mounted #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
loftyhauser wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Get data from all block devices not just mounted #58

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a47e061
Get data from all block devices not just mounted
loftyhauser Nov 18, 2017
6e8aecc
Fix memory and file descriptor leak
ndorf Sep 29, 2018
0520813
Merge branch 'udda:master' into master
loftyhauser Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 13 additions & 27 deletions common/graph-disk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
#include "util.h"


static const char *fstype_ignore_list[] = { "rootfs", "smbfs", "nfs", "cifs", "fuse.", NULL };


MultiloadFilter *
multiload_graph_disk_get_filter (LoadGraph *g, DiskData *xd)
Expand Down Expand Up @@ -94,47 +92,31 @@ multiload_graph_disk_get_filter (LoadGraph *g, DiskData *xd)
void
multiload_graph_disk_get_data (int Maximum, int data [2], LoadGraph *g, DiskData *xd, gboolean first_call)
{
FILE *f_mntent;
FILE *f_stat;
struct mntent *mnt;

char *buf = NULL;
size_t n = 0;

guint i;
int max;

char sysfs_path[PATH_MAX];
char *device;
char prefix[20];
guint64 blocks;
char device[20], prefix[20];
guint64 read, write;
guint64 read_total = 0, write_total = 0;
guint64 readdiff, writediff;


if ((f_mntent = setmntent(MOUNTED, "r")) == NULL)
return;
FILE *f = info_file_required_fopen("/proc/partitions", "r");

xd->partitions[0] = '\0';

// loop through mountpoints
while ((mnt = getmntent(f_mntent)) != NULL) {

// skip filesystens that do not have a block device
if (strncmp (mnt->mnt_fsname, "/dev/", 5) != 0)
continue;

// skip filesystems of certain types, defined in fstype_ignore_list[]
gboolean ignore = FALSE;
for (i=0; fstype_ignore_list[i] != NULL; i++) {
if (strncmp (mnt->mnt_type, fstype_ignore_list[i], strlen(fstype_ignore_list[i])) == 0) {
ignore = TRUE;
break;
}
}
if (ignore)
while(getline(&buf, &n, f) >= 0) {
if (2 != fscanf(f, "%*u %*u %"G_GUINT64_FORMAT" %s", &blocks, device))
continue;

// extract block device and partition names
gboolean is_partition = FALSE;
device = &mnt->mnt_fsname[5];
g_strlcpy(prefix, device, sizeof(prefix));
for (i=0; prefix[i] != '\0'; i++) {
if (isdigit(prefix[i])) {
Expand All @@ -145,6 +127,7 @@ multiload_graph_disk_get_data (int Maximum, int data [2], LoadGraph *g, DiskData
}

// filter
gboolean ignore=FALSE;
if (g->config->filter_enable) {
MultiloadFilter *filter = multiload_filter_new_from_existing(g->config->filter);
for (i=0, ignore=TRUE; i<multiload_filter_get_length(filter); i++) {
Expand Down Expand Up @@ -184,7 +167,10 @@ multiload_graph_disk_get_data (int Maximum, int data [2], LoadGraph *g, DiskData
g_strlcat (xd->partitions, device, sizeof(xd->partitions));
g_strlcat (xd->partitions, ", ", sizeof(xd->partitions));
}
endmntent(f_mntent);

g_free(buf);
fclose(f);

xd->partitions[strlen(xd->partitions)-2] = 0;

readdiff = read_total - xd->last_read;
Expand Down