Attachment 175145 Details for Bug 212979 – proposed patch

proposed patch

patch-sysdeps_freebsd_procmap.c (text/x-csrc), 1.28 KB, created by markiyan.kushnir on 2016-09-24 22:03:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: markiyan.kushnir

Created: 2016-09-24 22:03:17 UTC

Size: 1.28 KB

patch

obsolete

>--- work/libgtop-2.32.0/sysdeps/freebsd/procmap.c	2015-08-17 21:59:37.000000000 +0300
>+++ sysdeps/freebsd/procmap.c	2016-09-25 03:54:04.639892000 +0300
>@@ -52,6 +52,10 @@
> #include <sys/mount.h>
> #include <ufs/ufs/quota.h>
> #include <ufs/ufs/inode.h>
>+#if (__FreeBSD_version >= 1200005) || (__FreeBSD_kernel_version >= 1200005)
>+#include <ufs/ufs/extattr.h>
>+#include <ufs/ufs/ufsmount.h>
>+#endif
> #include <fs/devfs/devfs.h>
> #if (__FreeBSD_version >= 600006) || defined(__FreeBSD_kernel__)
> #include <fs/devfs/devfs_int.h>
>@@ -167,8 +171,24 @@
> 
> 
> #if (__FreeBSD_version >= 800039) || (__FreeBSD_kernel_version >= 800039)
>+
>+#   if (__FreeBSD_version >= 1200005) || (__FreeBSD_kernel_version >= 1200005)
>+	struct  ufsmount um;
>+
>+	if (kvm_read(server->machine->kd,
>+		     (gulong) inode.i_ump,
>+		     (char *)&um,
>+		     sizeof(um)) != sizeof(um)) {
>+		glibtop_warn_io_r (server, "kvm_read (um)");
>+		return;
>+	}
>+
>+        if (kvm_read (server->machine->kd, (gulong) cdev2priv(um.um_dev), (char *) &priv,
>+		      sizeof (priv))
>+#   else
>         if (kvm_read (server->machine->kd, (gulong) cdev2priv(inode.i_dev), (char *) &priv,
> 		      sizeof (priv))
>+#   endif
> #else
>         if (kvm_read (server->machine->kd, (gulong) inode.i_dev, (char *) &si,
> 	              sizeof (si)) != sizeof (si) ||

Actions: View

Attachments on bug 212979: 175145