head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.24 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.22 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.20 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.18 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.16 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.14 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.12 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.10 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.8 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.6 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.4 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.2 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.5.0.2 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.4.0.8 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.6 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.4 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.2 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.3.0.2 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.2.0.14 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.12 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.10 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.6 date 2007.09.20.21.12.23; author wiz; state dead; branches; next 1.5; 1.5 date 2007.06.25.21.18.52; author joerg; state Exp; branches; next 1.4; 1.4 date 2006.06.26.12.14.25; author drochner; state Exp; branches; next 1.3; 1.3 date 2006.02.28.23.48.12; author joerg; state Exp; branches; next 1.2; 1.2 date 2004.04.07.11.39.48; author jmmv; state dead; branches; next 1.1; 1.1 date 2004.04.02.12.09.16; author jmmv; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.04.02.12.09.16; author jmmv; state Exp; branches; next ; desc @@ 1.6 log @Rename libgtop2 to libgtop, to match upstream name. @ text @$NetBSD: patch-al,v 1.5 2007/06/25 21:18:52 joerg Exp $ --- sysdeps/freebsd/procmem.c.orig 2005-12-12 10:09:39.000000000 +0000 +++ sysdeps/freebsd/procmem.c @@@@ -41,7 +41,9 @@@@ #include #include +#if !defined(__DragonFly__) #include +#endif #include #if (!defined __OpenBSD__) && (!defined __bsdi__) @@@@ -63,6 +65,10 @@@@ #include #endif +#ifdef __NetBSD__ +#include +#endif + static const unsigned long _glibtop_sysdeps_proc_mem = (1L << GLIBTOP_PROC_MEM_SIZE) + (1L << GLIBTOP_PROC_MEM_VSIZE) + @@@@ -214,8 +220,11 @@@@ glibtop_get_proc_mem_p (glibtop *server, return; } -#ifdef __FreeBSD__ -#if __FreeBSD__ >= 4 +#if defined(__DragonFly__) && (__DragonFly_version >= 180000) + if (entry.maptype != VM_MAPTYPE_NORMAL && entry.maptype != VM_MAPTYPE_VPAGETABLE) + continue; +#elif defined(__FreeBSD__) || defined(__DragonFly__) +#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ >= 4) if (entry.eflags & (MAP_ENTRY_IS_SUB_MAP)) continue; #else @ 1.5 log @Fix build on DragonFly 1.8+. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @make this build on recent -current, fixes PR pkg/33631 by Steven M. Bellovin @ text @d3 1 a3 1 --- sysdeps/freebsd/procmem.c.orig 2005-12-12 11:09:39.000000000 +0100 d5 11 a15 1 @@@@ -63,6 +63,10 @@@@ d26 1 a26 1 @@@@ -214,8 +218,8 @@@@ glibtop_get_proc_mem_p (glibtop *server, d32 4 a35 1 +#if defined(__FreeBSD__) || defined(__DragonFly__) @ 1.3 log @Add support for DragonFly. There are some minor issues left, e.g. installing of the backend daemon as kmem, but I don't want to make it the default, since almost all operations work without it. @ text @d3 1 a3 1 --- sysdeps/freebsd/procmem.c.orig 2005-03-01 23:03:57.000000000 +0000 d5 12 a16 1 @@@@ -213,8 +213,8 @@@@ glibtop_get_proc_mem_p (glibtop *server, @ 1.2 log @Update to 2.6.0. Can't find the list of changes but, AFAICT, this includes our patch for x86_64 support, some bug fixes, and updated and new translations. @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.1 2004/04/02 12:09:16 jmmv Exp $ d3 13 a15 12 --- sysdeps/freebsd/prockernel.c.orig 2004-03-11 03:23:52.000000000 +0100 +++ sysdeps/freebsd/prockernel.c @@@@ -228,6 +228,9 @@@@ glibtop_get_proc_kernel_p (glibtop *serv #if defined(__m68k__) buf->kstk_esp = (u_int64_t) pcb.pcb_usp; buf->kstk_eip = (u_int64_t) 0; +#elif defined(__x86_64__) + buf->kstk_esp = (u_int64_t) pcb.pcb_usersp; + buf->kstk_eip = (u_int64_t) 0; #elif (defined(__arm32__) || defined(__powerpc__)) buf->kstk_esp = (u_int64_t) pcb.pcb_sp; buf->kstk_eip = (u_int64_t) 0; @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.5 2004/04/01 18:34:27 jmmv Exp $ @ 1.1.1.1 log @Move libgtop2 to the sysutils category, coming from devel. This is version 2.5.2. @ text @@