head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.50 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.48 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.46 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.44 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.42 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.40 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.38 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.36 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.34 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.32 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.30 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.28 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.26 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.24 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.22 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.20 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.18 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.16 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.14 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.12 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.10 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.8 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.6 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.4 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.2 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.1.1.1.0.4 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.2 netbsd-1-6-1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2004.04.01.18.34.27; author jmmv; state dead; branches; next 1.2; 1.2 date 2003.12.13.20.27.42; author xtraeme; state Exp; branches; next 1.1; 1.1 date 2002.11.04.02.56.17; author rh; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.11.04.02.56.17; author rh; state Exp; branches; next ; desc @@ 1.3 log @Update to 2.5.2: - plenty of code cleanups - removed the dependency on libgnome, only glib required now - Linux 2.6 support, NetBSD support and better FreeBSD support - Make the block size available for filesystem statistics @ text @$NetBSD: patch-ag,v 1.2 2003/12/13 20:27:42 xtraeme Exp $ --- sysdeps/freebsd/procmem.c.orig Sat Sep 6 00:18:49 2003 +++ sysdeps/freebsd/procmem.c Sat Sep 6 00:22:45 2003 @@@@ -31,8 +31,12 @@@@ #include #include #include +#ifdef __NetBSD__ && (__NetBSD_Version__ >= 105020000) +#include +#else #include #include +#endif #include #include @@@@ -43,9 +47,14 @@@@ #include #endif #include +#ifdef __NetBSD__ && (__NetBSD_Version__ >= 105020000) +#include +#else #include +#endif -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) +#if defined(__NetBSD__) && \ + (__NetBSD_Version__ >= 104000000) && (__NetBSD_Version__ < 105020000) /* Fixme ... */ #undef _KERNEL #define _UVM_UVM_AMAP_I_H_ 1 @@@@ -113,7 +122,6 @@@@ struct vmspace *vms, vmspace; #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) struct vnode vnode; - struct inode inode; #else struct vm_object object; #endif @@@@ -136,9 +144,24 @@@@ glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid); return; } +#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013) + +#define XXX_P_VMSPACE ki_vmspace + + buf->rss_rlim = pinfo [0].ki_rssize; + + buf->vsize = buf->size = (u_int64_t) pagetok + (pinfo [0].ki_tsize + pinfo [0].ki_dsize + pinfo[0].ki_ssize) + << LOG1024; + buf->resident = buf->rss = (u_int64_t) pagetok + (pinfo [0].ki_rssize) << LOG1024; + +#else + +#define XXX_P_VMSPACE kp_proc.p_vmspace if (kvm_read (server->machine.kd, - (unsigned long) pinfo [0].kp_proc.p_limit, + (unsigned long) pinfo [0].XXX_P_VMSPACE, (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) { glibtop_warn_io_r (server, "kvm_read (plimit)"); return; @@@@ -154,11 +177,12 @@@@ buf->resident = buf->rss = (u_int64_t) pagetok (vms->vm_rssize) << LOG1024; +#endif /* Now we get the shared memory. */ if (kvm_read (server->machine.kd, - (unsigned long) pinfo [0].kp_proc.p_vmspace, + (unsigned long) pinfo [0].XXX_P_VMSPACE, (char *) &vmspace, sizeof (vmspace)) != sizeof (vmspace)) { glibtop_warn_io_r (server, "kvm_read (vmspace)"); return; @@@@ -233,17 +257,26 @@@@ /* 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 #ifdef __FreeBSD__ @ 1.2 log @Updated to 2.0.7. Changes: o Added more locale files. o Makefile.am: Change subdirectory build order so that 'distclean' target work (and other targets remain working). o libgtop-2.0.pc.in: Fix missing build flags. Patch from Julio Merino. o sysdeps/linux/mem.c: (glibtop_get_mem_s): Fix memory calculation under Linux. Patch from . And more... please review Changelog for a complete list of changes. pkgsrc-changes: o FreeBSD 4.x/5.x support (only tested on 5.x) @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ar,v 1.3 2001/09/25 01:31:18 wiz Exp $ d3 2 a4 2 --- sysdeps/freebsd/procmem.c.orig Thu May 27 20:56:49 1999 +++ sysdeps/freebsd/procmem.c d9 3 a11 1 +#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) a13 2 +#else +#include d22 3 a24 1 +#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) a25 2 +#else +#include d42 41 a82 1 @@@@ -233,17 +241,27 @@@@ d89 1 a90 1 d93 1 a93 2 +#if (__NetBSD_Version__ >= 105250000) d100 1 @ 1.1.1.1 log @Initial import of libgtop2-2.0.0, a library to retrieve system information, used in GNOME2 @ text @@