Skip to content

Fix sysfs path detection for /dev/nvme* and /dev/dm-* #63

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
nylen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix sysfs path detection for /dev/nvme* and /dev/dm-* #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
520ec4a
Ignore files generated by checkinstall
nylen Apr 25, 2018
adc0d5e
Fix sysfs path detection for /dev/nvme* and /dev/dm-*
nylen Apr 25, 2018
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
*~
*.deb
*.gmo
*.la
*.lo
*.o
*.swp
*.tar.*
*.tgz
.deps
.libs
ChangeLog
Expand All @@ -26,6 +28,8 @@ common/about-data.c
common/binary-data.c
common/color-scheme-icons.inc
data/generate-about-data.sh
description-pak
doc-pak
extras/pacman/*.PKGBUILD
indicator/multiload-ng-indicator
indicator/*.desktop
Expand Down
2 changes: 2 additions & 0 deletions common/graph-data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@ multiload_graph_load_cmdline_output (LoadGraph *g, LoadData *xd);
G_GNUC_INTERNAL void
multiload_graph_load_tooltip_update (char *buf_title, size_t len_title, char *buf_text, size_t len_text, LoadGraph *g, LoadData *xd, gint style);

G_GNUC_INTERNAL gboolean
multiload_graph_disk_device_is_partition (char *device, char *prefix, size_t sizeof_prefix);
G_GNUC_INTERNAL MultiloadFilter *
multiload_graph_disk_get_filter (LoadGraph *g, DiskData *xd);
G_GNUC_INTERNAL void
Expand Down
57 changes: 38 additions & 19 deletions common/graph-disk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,42 @@

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

gboolean
multiload_graph_disk_device_is_partition (char *device, char *prefix, size_t sizeof_prefix) {
gboolean is_partition = FALSE;
guint i;
g_strlcpy(prefix, device, sizeof_prefix);

if (strncmp (prefix, "nvme", 4) == 0) {
// several possibilities:
// - nvme0
// - nvme0n1
// - nvme0n1p1
// only the last one is a partition, with sysfs subfolder nvme0n1
for (i=4; prefix[i] != '\0'; i++) {
if (isdigit(prefix[i]) && prefix[i-1] == 'p') {
prefix[i-1] = '\0';
is_partition = TRUE;
break;
}
}
return is_partition;
}

if (strncmp (prefix, "dm-", 3) == 0) {
// device-mapper devices do not show up in a sysfs subfolder
return FALSE;
}

for (i=0; prefix[i] != '\0'; i++) {
if (isdigit(prefix[i])) {
prefix[i] = '\0';
is_partition = TRUE;
break;
}
}
return is_partition;
}

MultiloadFilter *
multiload_graph_disk_get_filter (LoadGraph *g, DiskData *xd)
Expand All @@ -44,7 +80,6 @@ multiload_graph_disk_get_filter (LoadGraph *g, DiskData *xd)

guint64 blocks;
char device[20], prefix[20], label[30];
guint i;

MultiloadFilter *filter = multiload_filter_new();

Expand All @@ -55,15 +90,7 @@ multiload_graph_disk_get_filter (LoadGraph *g, DiskData *xd)
continue;

// extract block device and partition names
gboolean is_partition = FALSE;
g_strlcpy(prefix, device, sizeof(prefix));
for (i=0; prefix[i] != '\0'; i++) {
if (isdigit(prefix[i])) {
prefix[i] = '\0';
is_partition = TRUE;
break;
}
}
gboolean is_partition = multiload_graph_disk_device_is_partition(device, prefix, sizeof(prefix));

// generate sysfs path
char sysfs_path[PATH_MAX];
Expand Down Expand Up @@ -133,16 +160,8 @@ multiload_graph_disk_get_data (int Maximum, int data [2], LoadGraph *g, DiskData
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])) {
prefix[i] = '\0';
is_partition = TRUE;
break;
}
}
gboolean is_partition = multiload_graph_disk_device_is_partition(device, prefix, sizeof(prefix));

// filter
if (g->config->filter_enable) {
Expand Down