sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-19 18:43:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

devel/libgtop: Fix build issue on 14-CURRENT

Browse source
This commit is contained in:
Neel Chauhan 2021-06-05 22:15:20 -07:00
parent f7fc40eb7b
commit 15e9a4872e
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
devel/libgtop/files/patch-sysdeps_freebsd_procmap.c
View file

@ -1,6 +1,15 @@
--- sysdeps/freebsd/procmap.c.orig 2019-02-04 20:15:22 UTC --- sysdeps/freebsd/procmap.c.orig 2021-06-06 05:13:00 UTC
+++ sysdeps/freebsd/procmap.c +++ sysdeps/freebsd/procmap.c
@@ -51,14 +51,15 @@ @@ -34,6 +34,8 @@
#include <vm/vm_map.h>
#include <vm/vm.h>
+#include <stdbool.h>
+
#define _KVM_VNODE
#include <sys/vnode.h>
#undef _KVM_VNODE
@@ -51,14 +53,15 @@
#define _KERNEL #define _KERNEL
#include <sys/mount.h> #include <sys/mount.h>
#include <ufs/ufs/quota.h> #include <ufs/ufs/quota.h>
@ -18,7 +27,7 @@
#if (__FreeBSD_version >= 1101001) #if (__FreeBSD_version >= 1101001)
#define _KERNEL #define _KERNEL
#include <ufs/ufs/extattr.h> #include <ufs/ufs/extattr.h>
@@ -95,12 +96,14 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, s @@ -95,12 +98,14 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, s
struct cdev_priv priv; struct cdev_priv priv;
#if __FreeBSD_version < 800039 #if __FreeBSD_version < 800039
struct cdev si; struct cdev si;
@ -34,7 +43,7 @@
(char *) &tagptr, sizeof (tagptr)) != sizeof (tagptr) || (char *) &tagptr, sizeof (tagptr)) != sizeof (tagptr) ||
kvm_read (server->machine->kd, (gulong) tagptr, kvm_read (server->machine->kd, (gulong) tagptr,
(char *) tagstr, sizeof (tagstr)) != sizeof (tagstr)) (char *) tagstr, sizeof (tagstr)) != sizeof (tagstr))
@@ -120,7 +123,7 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, s @@ -120,7 +125,7 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, s
return; return;
} }
@ -43,7 +52,7 @@
sizeof (inode)) != sizeof (inode)) sizeof (inode)) != sizeof (inode))
{ {
glibtop_warn_io_r (server, "kvm_read (inode)"); glibtop_warn_io_r (server, "kvm_read (inode)");
@@ -231,6 +234,32 @@ _glibtop_init_proc_map_p (glibtop *server) @@ -231,6 +236,32 @@ _glibtop_init_proc_map_p (glibtop *server)
server->sysdeps.proc_map = _glibtop_sysdeps_proc_map; server->sysdeps.proc_map = _glibtop_sysdeps_proc_map;
} }
@ -76,7 +85,7 @@
/* Provides detailed information about a process. */ /* Provides detailed information about a process. */
glibtop_map_entry * glibtop_map_entry *
@@ -238,13 +267,12 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_ @@ -238,13 +269,12 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
pid_t pid) pid_t pid)
{ {
struct kinfo_proc *pinfo; struct kinfo_proc *pinfo;
@ -92,7 +101,7 @@
memset (buf, 0, sizeof (glibtop_proc_map)); memset (buf, 0, sizeof (glibtop_proc_map));
@@ -273,16 +301,6 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_ @@ -273,16 +303,6 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
return NULL; return NULL;
} }
@ -109,7 +118,7 @@
/* Walk through the `vm_map_entry' list ... */ /* Walk through the `vm_map_entry' list ... */
/* I tested this a few times with `mmap'; as soon as you write /* I tested this a few times with `mmap'; as soon as you write
@@ -292,21 +310,17 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_ @@ -292,21 +312,17 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
maps = g_array_sized_new(FALSE, FALSE, sizeof(glibtop_map_entry), maps = g_array_sized_new(FALSE, FALSE, sizeof(glibtop_map_entry),
vmspace.vm_map.nentries); vmspace.vm_map.nentries);
@ -138,7 +147,7 @@
if (entry.eflags & (MAP_ENTRY_IS_SUB_MAP)) if (entry.eflags & (MAP_ENTRY_IS_SUB_MAP))
continue; continue;
@@ -377,7 +391,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_ @@ -377,7 +393,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
if (entry.protection & VM_PROT_EXECUTE) if (entry.protection & VM_PROT_EXECUTE)
mentry->perm |= GLIBTOP_MAP_PERM_EXECUTE; mentry->perm |= GLIBTOP_MAP_PERM_EXECUTE;