head 1.9; access; symbols pkgsrc-2026Q1:1.9.0.134 pkgsrc-2026Q1-base:1.9 pkgsrc-2025Q4:1.9.0.132 pkgsrc-2025Q4-base:1.9 pkgsrc-2025Q3:1.9.0.130 pkgsrc-2025Q3-base:1.9 pkgsrc-2025Q2:1.9.0.128 pkgsrc-2025Q2-base:1.9 pkgsrc-2025Q1:1.9.0.126 pkgsrc-2025Q1-base:1.9 pkgsrc-2024Q4:1.9.0.124 pkgsrc-2024Q4-base:1.9 pkgsrc-2024Q3:1.9.0.122 pkgsrc-2024Q3-base:1.9 pkgsrc-2024Q2:1.9.0.120 pkgsrc-2024Q2-base:1.9 pkgsrc-2024Q1:1.9.0.118 pkgsrc-2024Q1-base:1.9 pkgsrc-2023Q4:1.9.0.116 pkgsrc-2023Q4-base:1.9 pkgsrc-2023Q3:1.9.0.114 pkgsrc-2023Q3-base:1.9 pkgsrc-2023Q2:1.9.0.112 pkgsrc-2023Q2-base:1.9 pkgsrc-2023Q1:1.9.0.110 pkgsrc-2023Q1-base:1.9 pkgsrc-2022Q4:1.9.0.108 pkgsrc-2022Q4-base:1.9 pkgsrc-2022Q3:1.9.0.106 pkgsrc-2022Q3-base:1.9 pkgsrc-2022Q2:1.9.0.104 pkgsrc-2022Q2-base:1.9 pkgsrc-2022Q1:1.9.0.102 pkgsrc-2022Q1-base:1.9 pkgsrc-2021Q4:1.9.0.100 pkgsrc-2021Q4-base:1.9 pkgsrc-2021Q3:1.9.0.98 pkgsrc-2021Q3-base:1.9 pkgsrc-2021Q2:1.9.0.96 pkgsrc-2021Q2-base:1.9 pkgsrc-2021Q1:1.9.0.94 pkgsrc-2021Q1-base:1.9 pkgsrc-2020Q4:1.9.0.92 pkgsrc-2020Q4-base:1.9 pkgsrc-2020Q3:1.9.0.90 pkgsrc-2020Q3-base:1.9 pkgsrc-2020Q2:1.9.0.86 pkgsrc-2020Q2-base:1.9 pkgsrc-2020Q1:1.9.0.66 pkgsrc-2020Q1-base:1.9 pkgsrc-2019Q4:1.9.0.88 pkgsrc-2019Q4-base:1.9 pkgsrc-2019Q3:1.9.0.84 pkgsrc-2019Q3-base:1.9 pkgsrc-2019Q2:1.9.0.82 pkgsrc-2019Q2-base:1.9 pkgsrc-2019Q1:1.9.0.80 pkgsrc-2019Q1-base:1.9 pkgsrc-2018Q4:1.9.0.78 pkgsrc-2018Q4-base:1.9 pkgsrc-2018Q3:1.9.0.76 pkgsrc-2018Q3-base:1.9 pkgsrc-2018Q2:1.9.0.74 pkgsrc-2018Q2-base:1.9 pkgsrc-2018Q1:1.9.0.72 pkgsrc-2018Q1-base:1.9 pkgsrc-2017Q4:1.9.0.70 pkgsrc-2017Q4-base:1.9 pkgsrc-2017Q3:1.9.0.68 pkgsrc-2017Q3-base:1.9 pkgsrc-2017Q2:1.9.0.64 pkgsrc-2017Q2-base:1.9 pkgsrc-2017Q1:1.9.0.62 pkgsrc-2017Q1-base:1.9 pkgsrc-2016Q4:1.9.0.60 pkgsrc-2016Q4-base:1.9 pkgsrc-2016Q3:1.9.0.58 pkgsrc-2016Q3-base:1.9 pkgsrc-2016Q2:1.9.0.56 pkgsrc-2016Q2-base:1.9 pkgsrc-2016Q1:1.9.0.54 pkgsrc-2016Q1-base:1.9 pkgsrc-2015Q4:1.9.0.52 pkgsrc-2015Q4-base:1.9 pkgsrc-2015Q3:1.9.0.50 pkgsrc-2015Q3-base:1.9 pkgsrc-2015Q2:1.9.0.48 pkgsrc-2015Q2-base:1.9 pkgsrc-2015Q1:1.9.0.46 pkgsrc-2015Q1-base:1.9 pkgsrc-2014Q4:1.9.0.44 pkgsrc-2014Q4-base:1.9 pkgsrc-2014Q3:1.9.0.42 pkgsrc-2014Q3-base:1.9 pkgsrc-2014Q2:1.9.0.40 pkgsrc-2014Q2-base:1.9 pkgsrc-2014Q1:1.9.0.38 pkgsrc-2014Q1-base:1.9 pkgsrc-2013Q4:1.9.0.36 pkgsrc-2013Q4-base:1.9 pkgsrc-2013Q3:1.9.0.34 pkgsrc-2013Q3-base:1.9 pkgsrc-2013Q2:1.9.0.32 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.9.0.30 pkgsrc-2013Q1-base:1.9 pkgsrc-2012Q4:1.9.0.28 pkgsrc-2012Q4-base:1.9 pkgsrc-2012Q3:1.9.0.26 pkgsrc-2012Q3-base:1.9 pkgsrc-2012Q2:1.9.0.24 pkgsrc-2012Q2-base:1.9 pkgsrc-2012Q1:1.9.0.22 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.9.0.20 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q3:1.9.0.18 pkgsrc-2011Q3-base:1.9 pkgsrc-2011Q2:1.9.0.16 pkgsrc-2011Q2-base:1.9 pkgsrc-2011Q1:1.9.0.14 pkgsrc-2011Q1-base:1.9 pkgsrc-2010Q4:1.9.0.12 pkgsrc-2010Q4-base:1.9 pkgsrc-2010Q3:1.9.0.10 pkgsrc-2010Q3-base:1.9 pkgsrc-2010Q2:1.9.0.8 pkgsrc-2010Q2-base:1.9 pkgsrc-2010Q1:1.9.0.6 pkgsrc-2010Q1-base:1.9 pkgsrc-2009Q4:1.9.0.4 pkgsrc-2009Q4-base:1.9 pkgsrc-2009Q3:1.9.0.2 pkgsrc-2009Q3-base:1.9 pkgsrc-2008Q4:1.8.0.2 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.6.0.10 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.8 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.6 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.4 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.2 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.5.0.2 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.4.0.18 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.16 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.14 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.12 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.10 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.8 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.6 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.4 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.2 pkgsrc-2005Q2-base:1.4 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.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.2 TNF:1.1.1; locks; strict; comment @# @; 1.9 date 2009.08.27.20.03.17; author ahoka; state Exp; branches; next 1.8; 1.8 date 2008.11.16.20.31.09; author wiz; state dead; branches; next 1.7; 1.7 date 2008.11.15.19.34.11; author wiz; state Exp; branches; next 1.6; 1.6 date 2007.11.05.19.06.03; author drochner; state dead; branches; next 1.5; 1.5 date 2007.09.20.21.12.07; author wiz; state Exp; branches; next 1.4; 1.4 date 2005.05.18.22.02.21; author wiz; state dead; branches; next 1.3; 1.3 date 2004.04.02.12.13.57; author jmmv; 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 1.1.1.2; 1.1.1.2 date 2004.04.02.12.10.12; author jmmv; state Exp; branches; next ; desc @@ 1.9 log @Add "model name" to the sysinfo hash table. Fixes "Unknown CPU model" bug in gnome-system-monitor. @ text @$NetBSD$ --- sysdeps/bsd/sysinfo.c.orig 2009-08-27 14:29:56.000000000 +0200 +++ sysdeps/bsd/sysinfo.c @@@@ -36,6 +36,7 @@@@ static void init_sysinfo (glibtop *server) { char *model; + char *brand; guint64 ncpus = 1; int mhz = 0; size_t len; @@@@ -51,6 +52,12 @@@@ init_sysinfo (glibtop *server) sysctlbyname ("hw.model", NULL, &len, NULL, 0); model = g_malloc (len); sysctlbyname ("hw.model", model, &len, NULL, 0); + if (sysctlbyname ("machdep.cpu_brand", NULL, &len, NULL, 0) != -1) { + brand = g_malloc (len); + sysctlbyname ("machdep.cpu_brand", brand, &len, NULL, 0); + } else { + brand = model; + } len = sizeof (mhz); sysctlbyname ("hw.clockrate", &mhz, &len, NULL, 0); @@@@ -73,6 +80,10 @@@@ init_sysinfo (glibtop *server) g_hash_table_insert (cpuinfo->values, "vendor_id", g_strdup(model)); + g_ptr_array_add (cpuinfo->labels, "model name"); + g_hash_table_insert (cpuinfo->values, "model name", + g_strdup(brand)); + g_ptr_array_add (cpuinfo->labels, "cpu MHz"); g_hash_table_insert (cpuinfo->values, "cpu MHz", g_strdup_printf("%d", mhz)); @ 1.8 log @Add processor affinity support, from Juan Romero Pardines -- thank you! Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.7 2008/11/15 19:34:11 wiz Exp $ d3 22 a24 5 --- sysdeps/freebsd/procaffinity.c.orig 2008-08-18 15:23:36.000000000 +0000 +++ sysdeps/freebsd/procaffinity.c @@@@ -21,7 +21,9 @@@@ #include #include d26 3 a28 3 +#if defined(__FreeBSD__) #include +#endif d30 7 a36 11 #include #if __FreeBSD_version > 800024 @@@@ -41,7 +43,7 @@@@ _glibtop_init_proc_affinity_s(glibtop *s guint16 * glibtop_get_proc_affinity_s(glibtop *server, glibtop_proc_affinity *buf, pid_t pid) { -#if __FreeBSD_version > 800024 +#if defined(__FreeBSD__) && __FreeBSD_version > 800024 id_t id; cpulevel_t level; cpuwhich_t which; @ 1.7 log @Update to 2.24.0. New cpu affinity code (see changes for 2.23.2 below) is ifdef'd out. 22 Septembre 2008: Overview of changes in 2.24.0 ================================================ * Translation updates. 18 August 2008: Overview of changes in 2.23.90 ============================================== * freebsd: - updated port by Joe Marcus Clarke. 23 June 2008: Overview of changes in 2.23.4 =========================================== * linux: - Fixed and improved glibtop_get_fsusage with kernel >= 2.6.25. Closes #539360. 24 May 2008: Overview of changes in 2.23.2 ========================================== * glibtop_get_proc_open_files API can also lists IPv6 TCP sockets. * glibtop_get_proc_affinity : new API to retrieve process CPU affinity. (Let's hope one day i'll find the gtk-doc documentation ...) * linux: - fixed parsing of big /proc/stat for uptime. 04 April 2008: Overview of changes in 2.22.1 ============================================ * Fixed compilation/dist for !linux. Closes #525953. 10 Mars 2008: Overview of changes in 2.22.0 =========================================== * linux: - fixed proc_kernel. 25 February 2008: Overview of changes in 2.21.92 ================================================ * linux: - fixed smaps parsing on >= 2.6.24.x. 14 January 2008: Overview of changes in 2.21.5 ============================================== * freebsd: - fixed build on GNU/kfreebsd. Petr Salinger. - fixed procmem units. Kuang-che Wu. 28 October 2007: Overview of changes in 2.21.1 ============================================== * don't export _p/_s private symbols anymore. This is not an API/ABI breakage. * darwin implementation by Benjamin Reed. * linux: - splitted fsusage and mountlist implementations; - smarter mountlist(allfs = False); - fixed some compile warning on 64bit; * solaris: - fixed netload build by Henry Zhang. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 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 @d1 1 a1 1 $NetBSD: patch-ad,v 1.5 2007/09/20 21:12:07 wiz Exp $ d3 5 a7 5 --- sysdeps/freebsd/fsusage.c.orig 2006-04-09 18:52:45.000000000 +0200 +++ sysdeps/freebsd/fsusage.c @@@@ -47,8 +47,12 @@@@ _glibtop_freebsd_get_fsusage_read_write( return; } d9 2 a10 3 +#ifdef HAVE_STATVFS_READS_COUNT buf->read = sfs.f_syncreads + sfs.f_asyncreads; + buf->flags |= (1 << GLIBTOP_FSUSAGE_READ); d12 12 a23 7 +#ifdef HAVE_STATVFS_WRITES_COUNT buf->write = sfs.f_syncwrites + sfs.f_asyncwrites; - - buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE); + buf->flags |= (1 << GLIBTOP_FSUSAGE_WRITE); +#endif } @ 1.5 log @Rename libgtop2 to libgtop, to match upstream name. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.5 2006/08/06 19:06:44 jmmv Exp $ @ 1.4 log @Remove gnome1 packages except as needed for gnucash. Ok'd by jmmv@@ and rh@@ (gnome 1 maintainers). @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.3 2004/04/02 12:13:57 jmmv Exp $ d3 4 a6 12 --- sysdeps/freebsd/procargs.c.orig Thu May 27 16:04:01 1999 +++ sysdeps/freebsd/procargs.c Sat Jun 3 23:18:52 2000 @@@@ -83,9 +83,9 @@@@ args = kvm_getargv (server->machine.kd, pinfo, max_len); if (args == NULL) { - glibtop_suid_leave (server); - glibtop_warn_io_r (server, "kvm_getargv (%d)", pid); - return NULL; + static char *dummy = NULL; + + args = &dummy; d9 11 a19 1 glibtop_suid_leave (server); @ 1.3 log @Finish move of libgtop from devel to sysutils, incomplete due to conflicts... So I now see the package was previously here; the reason for the move is to lighten a bit the devel category, which has lots of packages. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.6 2000/06/03 21:25:55 tron Exp $ @ 1.2 log @Move "libgtop" package to "devel" category. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.1 1998/10/07 13:11:35 agc Exp $ d3 3 a5 3 --- sysdeps/bsd/mem.c 1998/10/06 16:43:47 1.1 +++ sysdeps/bsd/mem.c 1998/10/06 16:48:51 @@@@ -116,11 +116,19 @@@@ d7 9 a15 1 /* convert memory stats to Kbytes */ d17 1 a17 16 +#ifdef __NetBSD__ + buf->total = (u_int64_t) pagetok (vmm.v_kernel_pages) << LOG1024; +#else buf->total = (u_int64_t) pagetok (vmm.v_page_count) << LOG1024; +#endif buf->used = (u_int64_t) pagetok (vmm.v_active_count) << LOG1024; buf->free = (u_int64_t) pagetok (vmm.v_free_count) << LOG1024; +#ifdef __NetBSD__ + buf->cached = (u_int64_t) pagetok (vmm.v_wire_count) << LOG1024; +#else buf->cached = (u_int64_t) pagetok (vmm.v_cache_count) << LOG1024; +#endif buf->shared = (u_int64_t) pagetok (vmt.t_vmshr) << LOG1024; buf->buffer = (u_int64_t) bufspace; @ 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 @@ 1.1.1.2 log @Move libgtop to the sysutils category, coming from devel. This is version 1.0.13nb4. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.6 2000/06/03 21:25:55 tron Exp $ d3 3 a5 3 --- sysdeps/freebsd/procargs.c.orig Thu May 27 16:04:01 1999 +++ sysdeps/freebsd/procargs.c Sat Jun 3 23:18:52 2000 @@@@ -83,9 +83,9 @@@@ d7 1 a7 9 args = kvm_getargv (server->machine.kd, pinfo, max_len); if (args == NULL) { - glibtop_suid_leave (server); - glibtop_warn_io_r (server, "kvm_getargv (%d)", pid); - return NULL; + static char *dummy = NULL; + + args = &dummy; } d9 16 a24 1 glibtop_suid_leave (server); @