svn commit: r522971 - head/devel/libgtop/files

[Koop Mast]

Author: kwm
Date: Mon Jan 13 19:02:54 2020
New Revision: 522971
URL: https://svnweb.freebsd.org/changeset/ports/522971

Log:
  Commit the correct patch.
  
  PR:		242533
  Submitted by:	Neel Chauhan <neel AT neelc DOT org>
  Pointyhat to: 	kwm@

Modified:
  head/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c

Modified: head/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c
==============================================================================
--- head/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c	Mon Jan 13 18:48:28 2020	(r522970)
+++ head/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c	Mon Jan 13 19:02:54 2020	(r522971)
@@ -1,5 +1,5 @@
---- sysdeps/freebsd/procmap.c.orig	2017-08-07 18:43:41.000000000 -0400
-+++ sysdeps/freebsd/procmap.c	2019-12-26 16:37:29.791528000 -0500
+--- sysdeps/freebsd/procmap.c.orig	2017-08-07 22:43:41 UTC
++++ sysdeps/freebsd/procmap.c
 @@ -52,6 +52,8 @@
  #include <sys/mount.h>
  #include <ufs/ufs/quota.h>
@@ -9,7 +9,7 @@
  #include <fs/devfs/devfs.h>
  #if (__FreeBSD_version >= 600006) || defined(__FreeBSD_kernel__)
  #include <fs/devfs/devfs_int.h>
-@@ -95,6 +97,8 @@
+@@ -95,12 +97,14 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, s
          struct cdev_priv priv;
  #if __FreeBSD_version < 800039
          struct cdev si;
@@ -18,7 +18,14 @@
  #endif
  
          *inum = 0;
-@@ -231,6 +235,32 @@
+         *dev = 0;
+ 
+-        if (kvm_read (server->machine->kd, (gulong) &vnode->v_tag,
++        if (kvm_read (server->machine->kd, (gulong) &vnode->v_lock.lock_object.lo_name,
+  	             (char *) &tagptr, sizeof (tagptr)) != sizeof (tagptr) ||
+             kvm_read (server->machine->kd, (gulong) tagptr,
+ 		     (char *) tagstr, sizeof (tagstr)) != sizeof (tagstr))
+@@ -231,6 +235,32 @@ _glibtop_init_proc_map_p (glibtop *server)
          server->sysdeps.proc_map = _glibtop_sysdeps_proc_map;
  }
  
@@ -51,7 +58,7 @@
  /* Provides detailed information about a process. */
  
  glibtop_map_entry *
-@@ -238,13 +268,12 @@
+@@ -238,13 +268,12 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
                          pid_t pid)
  {
          struct kinfo_proc *pinfo;
@@ -67,7 +74,7 @@
  
          memset (buf, 0, sizeof (glibtop_proc_map));
  
-@@ -273,16 +302,6 @@
+@@ -273,16 +302,6 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
                  return NULL;
          }
  
@@ -84,7 +91,7 @@
          /* Walk through the `vm_map_entry' list ... */
  
          /* I tested this a few times with `mmap'; as soon as you write
-@@ -292,21 +311,17 @@
+@@ -292,21 +311,17 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
          maps = g_array_sized_new(FALSE, FALSE, sizeof(glibtop_map_entry),
                                   vmspace.vm_map.nentries);
  
@@ -113,7 +120,7 @@
  
                  if (entry.eflags & (MAP_ENTRY_IS_SUB_MAP))
                          continue;
-@@ -377,7 +392,7 @@
+@@ -377,7 +392,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
                  if (entry.protection & VM_PROT_EXECUTE)
                          mentry->perm |= GLIBTOP_MAP_PERM_EXECUTE;