head 1.1; access; symbols pkgsrc-2026Q2:1.1.0.154 pkgsrc-2026Q2-base:1.1 pkgsrc-2026Q1:1.1.0.152 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.150 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.148 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.146 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.144 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.142 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.140 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.138 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.136 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.134 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.132 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.130 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.128 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.126 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.124 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.122 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.120 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.118 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.116 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.114 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.112 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.110 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.108 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.104 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.84 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.106 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.102 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.100 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.98 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.96 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.94 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.92 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.90 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.88 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.86 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.82 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.80 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.78 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.76 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.74 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.72 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.70 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.68 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.66 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.64 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.62 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.60 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.58 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.56 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.54 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.52 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.50 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.48 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.46 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.44 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.42 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.40 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.38 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.36 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.34 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.32 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.30 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.28 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.26 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.24 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.22 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.20 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.18 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.16 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.14 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.12 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.10 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.8 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.6 pkgsrc-2008Q1:1.1.0.4 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.2 pkgsrc-2007Q4-base:1.1; locks; strict; comment @# @; 1.1 date 2007.11.05.19.06.06; author drochner; state Exp; branches; next ; desc @@ 1.1 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/procargs.c.orig 2007-04-27 00:27:34.000000000 +0200 +++ sysdeps/bsd/procargs.c @@@@ -47,12 +47,16 @@@@ char * glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf, pid_t pid, unsigned max_len) { +#if defined(__NetBSD__) + struct kinfo_proc2 *pinfo; +#else struct kinfo_proc *pinfo; +#endif char *retval, **args, **ptr; size_t size = 0, pos = 0; int count; -#ifndef __bsdi__ +#if !defined(__bsdi__) && !defined(__NetBSD) char filename [BUFSIZ]; struct stat statb; #endif @@@@ -64,7 +68,7 @@@@ glibtop_get_proc_args_p (glibtop *server /* swapper, init, pagedaemon, vmdaemon, update - this doen't work. */ if (pid < 5) return NULL; -#ifndef __bsdi__ +#if !defined(__bsdi__) && !defined(__NetBSD__) sprintf (filename, "/proc/%d/mem", pid); if (stat (filename, &statb)) return NULL; #endif @@@@ -72,14 +76,23 @@@@ glibtop_get_proc_args_p (glibtop *server glibtop_suid_enter (server); /* Get the process data */ +#if defined(__NetBSD__) + pinfo = kvm_getproc2 (server->machine.kd, KERN_PROC_PID, pid, + sizeof (*pinfo), &count); +#else pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count); +#endif if ((pinfo == NULL) || (count < 1)) { glibtop_suid_leave (server); glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid); return NULL; } +#if defined(__NetBSD__) + args = kvm_getargv2 (server->machine.kd, pinfo, max_len); +#else args = kvm_getargv (server->machine.kd, pinfo, max_len); +#endif if (args == NULL) { glibtop_suid_leave (server); glibtop_warn_io_r (server, "kvm_getargv (%d)", pid); @