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-ah,v 1.2 2003/12/13 20:27:42 xtraeme Exp $ --- sysdeps/freebsd/procmap.c.orig 2003-09-07 00:45:14.000000000 +0200 +++ sysdeps/freebsd/procmap.c 2003-09-07 00:51:01.000000000 +0200 @@@@ -32,9 +32,21 @@@@ #include #include #include +#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) #include #include #include +#elif defined(__NetBSD__) && (__NetBSD_Version__ >= 105020000) +#include +#else +#include +#include +#if (__FreeBSD_version >= 400011) +#include +#else +#include +#endif +#endif #include #include @@@@ -46,7 +58,9 @@@@ #include #endif #include +#if !defined(__NetBSD__) || (__NetBSD_Version__ < 105020000) #include +#endif #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) /* Fixme ... */ @@@@ -91,8 +105,9 @@@@ glibtop_map_entry *maps; #if defined __FreeBSD__ struct vnode vnode; +#if __FreeBSD_version >= 500039 struct inode inode; - struct mount mount; +#endif #endif int count, i = 0; int update = 0; @@@@ -114,7 +129,11 @@@@ /* Now we get the memory maps. */ if (kvm_read (server->machine.kd, +#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013) + (unsigned long) pinfo [0].ki_vmspace, +#else (unsigned long) pinfo [0].kp_proc.p_vmspace, +#endif (char *) &vmspace, sizeof (vmspace)) != sizeof (vmspace)) glibtop_error_io_r (server, "kvm_read (vmspace)"); @@@@ -214,9 +233,10 @@@@ #endif #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; @@@@ -244,6 +264,15 @@@@ &vnode, sizeof (vnode)) != sizeof (vnode)) glibtop_error_io_r (server, "kvm_read (vnode)"); +#if defined(__FreeBSD__) && (__FreeBSD_version >= 500039) + switch (vnode.v_type) { + case VREG: + maps [i-1].inode = vnode.v_cachedid; + maps [i-1].device = vnode.v_cachedfs; + default: + continue; + } +#else if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) || !vnode.v_data) continue; @@@@ -256,7 +285,7 @@@@ (unsigned long) vnode.v_mount, &mount, sizeof (mount)) != sizeof (mount)) glibtop_error_io_r (server, "kvm_read (mount)"); - +#endif maps [i-1].inode = inode.i_number; maps [i-1].device = inode.i_dev; #endif @ 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-aq,v 1.2 2000/11/29 21:02:05 tron Exp $ d3 3 a5 3 --- sysdeps/freebsd/procmap.c.orig Thu May 27 20:56:48 1999 +++ sysdeps/freebsd/procmap.c Wed Nov 29 21:57:15 2000 @@@@ -32,9 +32,13 @@@@ d13 7 d21 2 a22 1 +#include d27 1 a27 1 @@@@ -46,9 +50,12 @@@@ d31 1 a31 1 +#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) d35 1 a35 3 -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) +#if defined(__NetBSD__) && \ + (__NetBSD_Version__ >= 104000000) && (__NetBSD_Version < 105020000) d37 24 a60 3 #undef _KERNEL #define _UVM_UVM_AMAP_I_H_ 1 @@@@ -214,11 +221,13 @@@@ d67 8 d76 9 d87 6 d94 3 a96 3 if (kvm_read (server->machine.kd, (unsigned long) vnode.v_data, @ 1.1.1.1 log @Initial import of libgtop2-2.0.0, a library to retrieve system information, used in GNOME2 @ text @@