diff options
| author | Benoit Dejean <bdejean@gmail.com> | 2015-06-21 13:43:14 +0200 |
|---|---|---|
| committer | Robert Roth <robert.roth.off@gmail.com> | 2015-06-26 02:57:41 +0300 |
| commit | f4b23ef0c63acd3c47442c765281f989bfb888a3 (patch) | |
| tree | 37ede80b71d77ebb88ab3ca59e1acf327aacc180 /sysdeps/freebsd | |
| parent | 1f41349a7eebf1e2db368c6a9988cdc54ef44db1 (diff) | |
| download | libgtop-f4b23ef0c63acd3c47442c765281f989bfb888a3.tar.gz | |
Split the code that works only with UFS inode. Will ease new code for ZFS.
Diffstat (limited to 'sysdeps/freebsd')
| -rw-r--r-- | sysdeps/freebsd/procmap.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/sysdeps/freebsd/procmap.c b/sysdeps/freebsd/procmap.c index b40722e2..6d1c8548 100644 --- a/sysdeps/freebsd/procmap.c +++ b/sysdeps/freebsd/procmap.c @@ -80,6 +80,8 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, struct vnode *vnode, { char *tagptr; char tagstr[12]; + enum FS_TYPE { UNKNOWN, IS_UFS, IS_ZFS }; + int fs_type = UNKNOWN; struct inode inode; struct cdev_priv priv; #if __FreeBSD_version < 800039 @@ -100,8 +102,14 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, struct vnode *vnode, tagstr[sizeof(tagstr) - 1] = '\0'; - if (strcmp (tagstr, "ufs")) + if (!strcmp(tagstr, "ufs")) { + fs_type = IS_UFS; + } else if (!strcmp(tagstr, "zfs")) { + fs_type = IS_ZFS; + } else { + glibtop_warn_io_r (server, "ignoring fstype %s", tagstr); return; + } if (kvm_read (server->machine.kd, (gulong) VTOI(vn), (char *) &inode, sizeof (inode)) != sizeof (inode)) @@ -110,6 +118,16 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, struct vnode *vnode, return; } + + if (fs_type == IS_ZFS) { + /* NOP */ + } + else if (fs_type == IS_UFS) { + /* Set inum as soon as possible, so that if the next kvm_reads fail + we still have something */ + *inum = inode.i_number; + + #if (__FreeBSD_version >= 800039) || (__FreeBSD_kernel_version >= 800039) if (kvm_read (server->machine.kd, (gulong) cdev2priv(inode.i_dev), (char *) &priv, sizeof (priv)) @@ -125,8 +143,8 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, struct vnode *vnode, return; } - *inum = (guint64) inode.i_number; *dev = (guint64) priv.cdp_inode; + } /* end-if IS_UFS */ } #endif |