head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.152 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.150 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.148 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.146 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.144 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.142 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.140 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.138 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.136 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.134 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.132 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.130 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.128 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.126 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.124 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.122 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.120 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.118 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.116 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.114 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.112 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.110 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.108 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.104 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.84 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.106 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.102 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.100 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.98 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.96 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.94 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.92 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.90 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.88 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.86 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.82 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.80 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.78 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.76 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.74 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.72 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.70 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.68 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.66 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.64 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.62 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.60 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.58 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.56 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.54 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.52 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.50 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.48 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.46 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.44 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.42 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.40 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.38 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.36 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.34 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.32 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.30 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.28 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.26 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.24 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.22 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.20 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.18 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.16 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.14 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.12 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.10 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.8 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.6 pkgsrc-2008Q1:1.4.0.4 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.2 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.3.0.2 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.2.0.30 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.28 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.26 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2007.11.05.19.06.04; author drochner; state Exp; branches; next 1.3; 1.3 date 2007.09.20.21.12.09; author wiz; state Exp; branches; next 1.2; 1.2 date 98.11.01.23.24.18; author tron; state dead; branches; next 1.1; 1.1 date 98.10.07.13.11.35; author agc; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 98.10.07.13.11.35; author agc; state Exp; branches; next ; desc @@ 1.4 log @update to 2.20.0 This switches to the new gnome-2.20 branch. pkgsrc notes: -System dependant parts were reorganized upstream, in particular there if a subtree for FreeBSD now, and one for the other BSDs. I didn't pull in the DragonFly patches because I can't decide whether to base them on the freebsd or the rest. -I've changed the NetBSD code to use kinfo_proc2 almost completely. Some vm statistics reporting might be less accurate now because some fields in proc2 seem to be unmaintained by the current kernel (eg ixrss). -Also, some libgtop functions might be able to run in the non-privileged part now, but dealing with this would require even more #ifdefs, so we should consider setting up a private subtree as FreeBSD did. -I didn't verify with older NetBSDs; kvm_getproc2() has been in the tree for quite some time so I hope it will just work without the need for excessive "#if __NetBSD_Version__ > t". @ text @$NetBSD$ --- sysdeps/bsd/proclist.c.orig 2007-05-19 20:59:37.000000000 +0200 +++ sysdeps/bsd/proclist.c @@@@ -56,11 +56,15 @@@@ _glibtop_init_proclist_p (glibtop *serve server->sysdeps.proclist = _glibtop_sysdeps_proclist; } -unsigned * +pid_t * glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf, gint64 real_which, gint64 arg) { +#if defined(__NetBSD__) + struct kinfo_proc2 *pinfo; +#else struct kinfo_proc *pinfo; +#endif unsigned *pids = NULL; int which, count; int i,j; @@@@ -72,7 +76,12 @@@@ glibtop_get_proclist_p (glibtop *server, which = (int)(real_which & GLIBTOP_KERN_PROC_MASK); /* Get the process data */ +#if defined(__NetBSD__) + pinfo = kvm_getproc2 (server->machine.kd, which, arg, + sizeof (*pinfo), &count); +#else pinfo = kvm_getprocs (server->machine.kd, which, arg, &count); +#endif if ((pinfo == NULL) || (count < 1)) { glibtop_warn_io_r (server, "kvm_getprocs (proclist)"); return NULL; @@@@ -89,6 +98,12 @@@@ glibtop_get_proclist_p (glibtop *server, #define PROC_RUID ki_ruid #define PROC_PID ki_pid +#elif defined(__NetBSD__) + +#define PROC_STAT p_stat +#define PROC_RUID p_ruid +#define PROC_PID p_pid + #else #define PROC_STAT kp_proc.p_stat #define PROC_RUID kp_eproc.e_pcred.p_ruid @ 1.3 log @Rename libgtop2 to libgtop, to match upstream name. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.1 2006/02/28 23:48:12 joerg Exp $ d3 5 a7 3 --- sysdeps/freebsd/proclist.c.orig 2004-09-23 22:44:19.000000000 +0000 +++ sysdeps/freebsd/proclist.c @@@@ -92,7 +92,11 @@@@ glibtop_get_proclist_p (glibtop *server, d9 36 a46 3 +#ifdef __DragonFly__ +#define PROC_RUID kp_eproc.e_ucred.cr_ruid +#else a47 4 +#endif #define PROC_PID kp_proc.p_pid #endif @ 1.2 log @Move "libgtop" package to "devel" category. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.1 1998/10/07 13:11:35 agc Exp $ d3 10 a12 8 --- sysdeps/bsd/prockernel.c 1998/10/07 11:54:44 1.1 +++ sysdeps/bsd/prockernel.c 1998/10/07 12:01:57 @@@@ -31,7 +31,9 @@@@ #include #include #include +#ifdef __FreeBSD__ #include d14 1 d16 1 a16 13 #include #include @@@@ -120,8 +122,10 @@@@ { /* Same like with pstats above. */ +#ifdef __FreeBSD__ buf->kstk_esp = (u_int64_t) pcb.pcb_ksp; buf->kstk_eip = (u_int64_t) pcb.pcb_pc; +#endif buf->flags |= _glibtop_sysdeps_proc_kernel_pcb; } @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of libgtop-0.26 into the Packages Collection. This is part of the GNOME project, and is used to retrieve system information, such as CPU usage etc. This is not yet complete, but is functional to the point where the whole thing compiles and installs. Someone else can pick this up and run with it now. @ text @@