diff options
Diffstat (limited to 'sysdeps/freebsd/procmem.c')
| -rw-r--r-- | sysdeps/freebsd/procmem.c | 149 |
1 files changed, 8 insertions, 141 deletions
diff --git a/sysdeps/freebsd/procmem.c b/sysdeps/freebsd/procmem.c index 864ff344..d18df8a4 100644 --- a/sysdeps/freebsd/procmem.c +++ b/sysdeps/freebsd/procmem.c @@ -32,36 +32,17 @@ #include <sys/param.h> #include <sys/proc.h> #include <sys/resource.h> -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105020000) -#include <uvm/uvm_extern.h> -#else #include <vm/vm_object.h> #include <vm/vm_map.h> -#endif #include <sys/vnode.h> #include <ufs/ufs/quota.h> #include <ufs/ufs/inode.h> #include <sys/ucred.h> -#if (!defined __OpenBSD__) && (!defined __bsdi__) #include <sys/user.h> -#endif #include <sys/sysctl.h> -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105020000) -#include <uvm/uvm.h> -#else #include <vm/vm.h> -#endif - -#if defined(__NetBSD__) && \ - (__NetBSD_Version__ >= 104000000) && (__NetBSD_Version__ < 105020000) -/* Fixme ... */ -#undef _KERNEL -#define _UVM_UVM_AMAP_I_H_ 1 -#define _UVM_UVM_MAP_I_H_ 1 -#include <uvm/uvm.h> -#endif static const unsigned long _glibtop_sysdeps_proc_mem = (1L << GLIBTOP_PROC_MEM_SIZE) + @@ -71,43 +52,16 @@ static const unsigned long _glibtop_sysdeps_proc_mem = (1L << GLIBTOP_PROC_MEM_RSS_RLIM); static const unsigned long _glibtop_sysdeps_proc_mem_share = -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) -(1L << GLIBTOP_PROC_MEM_SHARE); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) (1L << GLIBTOP_PROC_MEM_SHARE); -#else -0; -#endif - -#ifndef LOG1024 -#define LOG1024 10 -#endif - -/* these are for getting the memory statistics */ -static int pageshift; /* log base 2 of the pagesize */ /* define pagetok in terms of pageshift */ -#define pagetok(size) ((size) << pageshift) +#define ps_pgtok(a) (((a) * getpagesize()) / 1024) /* Init function. */ void glibtop_init_proc_mem_p (glibtop *server) { - register int pagesize; - - /* get the page size with "getpagesize" and calculate pageshift - * from it */ - pagesize = getpagesize (); - pageshift = 0; - while (pagesize > 1) { - pageshift++; - pagesize >>= 1; - } - - /* we only need the amount of log(2)1024 for our conversion */ - pageshift -= LOG1024; - server->sysdeps.proc_mem = _glibtop_sysdeps_proc_mem | _glibtop_sysdeps_proc_mem_share; } @@ -120,15 +74,8 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf, { struct kinfo_proc *pinfo; struct vm_map_entry entry, *first; - struct vmspace *vms, vmspace; -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) - struct vnode vnode; -#else + struct vmspace vmspace; struct vm_object object; -#endif -#if (!defined(__FreeBSD__) || (__FreeBSD_version < 500013)) && !defined(__FreeBSD_kernel__) - struct plimit plimit; -#endif int count; glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0); @@ -147,40 +94,15 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf, glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid); return; } -#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__) #define PROC_VMSPACE ki_vmspace buf->rss_rlim = pinfo [0].ki_rssize; - buf->vsize = buf->size = (guint64) pagetok - (pinfo [0].ki_tsize + pinfo [0].ki_dsize + pinfo[0].ki_ssize) - << LOG1024; - buf->resident = buf->rss = (guint64) pagetok - (pinfo [0].ki_rssize) << LOG1024; - -#else - -#define PROC_VMSPACE kp_proc.p_vmspace - - if (kvm_read (server->machine.kd, - (unsigned long) pinfo [0].PROC_VMSPACE, - (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) { - glibtop_warn_io_r (server, "kvm_read (plimit)"); - return; - } - - buf->rss_rlim = (guint64) - (plimit.pl_rlimit [RLIMIT_RSS].rlim_cur); - - vms = &pinfo [0].kp_eproc.e_vm; - - buf->vsize = buf->size = (guint64) pagetok - (vms->vm_tsize + vms->vm_dsize + vms->vm_ssize) << LOG1024; - - buf->resident = buf->rss = (guint64) pagetok - (vms->vm_rssize) << LOG1024; -#endif + buf->vsize = buf->size = (guint64) + (pinfo [0].ki_size / 1024); + buf->resident = buf->rss = (guint64) + ps_pgtok (pinfo [0].ki_rssize); /* Now we get the shared memory. */ @@ -209,42 +131,14 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf, while (entry.next != first) { if (kvm_read (server->machine.kd, (unsigned long) entry.next, - &entry, sizeof (entry)) != sizeof (entry)) { + (char *) &entry, sizeof (entry)) != sizeof (entry)) { glibtop_warn_io_r (server, "kvm_read (entry)"); return; } -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -#if (__FreeBSD__ >= 4) || defined(__FreeBSD_kernel__) if (entry.eflags & (MAP_ENTRY_IS_SUB_MAP)) continue; -#else - if (entry.eflags & (MAP_ENTRY_IS_A_MAP|MAP_ENTRY_IS_SUB_MAP)) - continue; -#endif -#else -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) - if (UVM_ET_ISSUBMAP (&entry)) - continue; -#else - if (entry.is_a_map || entry.is_sub_map) - continue; -#endif -#endif - -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) - if (!entry.object.uvm_obj) - continue; - - /* We're only interested in vnodes */ - if (kvm_read (server->machine.kd, - (unsigned long) entry.object.uvm_obj, - &vnode, sizeof (vnode)) != sizeof (vnode)) { - glibtop_warn_io_r (server, "kvm_read (vnode)"); - return; - } -#else if (!entry.object.vm_object) continue; @@ -252,42 +146,15 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf, if (kvm_read (server->machine.kd, (unsigned long) entry.object.vm_object, - &object, sizeof (object)) != sizeof (object)) { + (char *) &object, sizeof (object)) != sizeof (object)) { glibtop_warn_io_r (server, "kvm_read (object)"); return; } -#endif - /* If the object is of type vnode, add its size */ - -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) -#if defined(UVM_VNODE_VALID) - if (!vnode.v_uvm.u_flags & UVM_VNODE_VALID) - continue; -#endif - if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) || - !vnode.v_data) continue; -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105250000) - /* Reference count must be at least two. */ - if (vnode.v_usecount <= 1) - continue; - - buf->share += pagetok (vnode.v_uobj.uo_npages) << LOG1024; -#else - - /* Reference count must be at least two. */ - if (vnode.v_uvm.u_obj.uo_refs <= 1) - continue; - - buf->share += pagetok (vnode.v_uvm.u_obj.uo_npages) << LOG1024; -#endif /* __NetBSD_Version__ >= 105250000 */ -#endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) if (object.type != OBJT_VNODE) continue; buf->share += object.un_pager.vnp.vnp_size; -#endif } buf->flags = _glibtop_sysdeps_proc_mem | |