From owner-svn-ports-head@freebsd.org Mon Jan 13 19:02:55 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 844A51E8DE8; Mon, 13 Jan 2020 19:02:55 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47xNJb30Cyz43Xg; Mon, 13 Jan 2020 19:02:55 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 620F2947D; Mon, 13 Jan 2020 19:02:55 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00DJ2tCw040685; Mon, 13 Jan 2020 19:02:55 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00DJ2tiQ040684; Mon, 13 Jan 2020 19:02:55 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <202001131902.00DJ2tiQ040684@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Mon, 13 Jan 2020 19:02:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r522971 - head/devel/libgtop/files X-SVN-Group: ports-head X-SVN-Commit-Author: kwm X-SVN-Commit-Paths: head/devel/libgtop/files X-SVN-Commit-Revision: 522971 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jan 2020 19:02:55 -0000 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 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 #include @@ -9,7 +9,7 @@ #include #if (__FreeBSD_version >= 600006) || defined(__FreeBSD_kernel__) #include -@@ -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;