head 1.9; access; symbols pkgsrc-2020Q1:1.8.0.88 pkgsrc-2020Q1-base:1.8 pkgsrc-2019Q4:1.8.0.110 pkgsrc-2019Q4-base:1.8 pkgsrc-2019Q3:1.8.0.106 pkgsrc-2019Q3-base:1.8 pkgsrc-2019Q2:1.8.0.104 pkgsrc-2019Q2-base:1.8 pkgsrc-2019Q1:1.8.0.102 pkgsrc-2019Q1-base:1.8 pkgsrc-2018Q4:1.8.0.100 pkgsrc-2018Q4-base:1.8 pkgsrc-2018Q3:1.8.0.98 pkgsrc-2018Q3-base:1.8 pkgsrc-2018Q2:1.8.0.96 pkgsrc-2018Q2-base:1.8 pkgsrc-2018Q1:1.8.0.94 pkgsrc-2018Q1-base:1.8 pkgsrc-2017Q4:1.8.0.92 pkgsrc-2017Q4-base:1.8 pkgsrc-2017Q3:1.8.0.90 pkgsrc-2017Q3-base:1.8 pkgsrc-2017Q2:1.8.0.86 pkgsrc-2017Q2-base:1.8 pkgsrc-2017Q1:1.8.0.84 pkgsrc-2017Q1-base:1.8 pkgsrc-2016Q4:1.8.0.82 pkgsrc-2016Q4-base:1.8 pkgsrc-2016Q3:1.8.0.80 pkgsrc-2016Q3-base:1.8 pkgsrc-2016Q2:1.8.0.78 pkgsrc-2016Q2-base:1.8 pkgsrc-2016Q1:1.8.0.76 pkgsrc-2016Q1-base:1.8 pkgsrc-2015Q4:1.8.0.74 pkgsrc-2015Q4-base:1.8 pkgsrc-2015Q3:1.8.0.72 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.70 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.68 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.66 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.64 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.62 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.60 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.58 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.56 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.54 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.52 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.50 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.48 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.46 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.44 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.42 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.40 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.38 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.36 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.34 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.32 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.30 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.28 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.26 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.24 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.8.0.22 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.8.0.20 pkgsrc-2009Q1-base:1.8 pkgsrc-2008Q4:1.8.0.18 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.16 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.14 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.12 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.10 pkgsrc-2008Q1:1.8.0.8 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.6 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.4 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.2 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.7.0.28 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.26 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.24 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.22 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.20 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.18 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.16 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.14 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.12 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.10 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.8 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.6 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.4 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 netbsd-1-6-1:1.6.0.2 netbsd-1-6-1-base:1.6 netbsd-1-6:1.5.0.8 netbsd-1-6-RELEASE-base:1.5 pkgviews:1.5.0.4 pkgviews-base:1.5 buildlink2:1.5.0.2 buildlink2-base:1.5 netbsd-1-5-PATCH003:1.5 netbsd-1-5-PATCH001:1.5 netbsd-1-5-RELEASE:1.5 netbsd-1-4-PATCH003:1.5 netbsd-1-3-PATCH002:1.1; locks; strict; comment @# @; 1.9 date 2020.05.24.11.24.19; author rillig; state dead; branches; next 1.8; commitid oUrjRpsulUaW8u9C; 1.8 date 2007.04.09.21.22.11; author veego; state Exp; branches; next 1.7; 1.7 date 2003.11.10.17.18.28; author agc; state dead; branches; next 1.6; 1.6 date 2002.12.11.21.38.06; author christos; state Exp; branches; next 1.5; 1.5 date 2000.08.18.22.43.53; author christos; state Exp; branches; next 1.4; 1.4 date 2000.06.27.08.15.51; author tron; state Exp; branches; next 1.3; 1.3 date 2000.04.13.10.03.53; author mrg; state Exp; branches; next 1.2; 1.2 date 98.05.18.09.07.33; author tron; state dead; branches; next 1.1; 1.1 date 98.03.18.13.42.16; author agc; state Exp; branches; next ; desc @@ 1.9 log @sysutils/xosview: update to 1.22 This gets rid of a few uncommented and unclear patches. The upstream code has changed a lot, therefore the pkgsrc patches have all been dropped. Upstream changes are unknown since the CHANGES file mentions 1.9 as the latest version. @ text @$NetBSD: patch-ad,v 1.8 2007/04/09 21:22:11 veego Exp $ --- bsd/netmeter.cc.orig 2003-10-10 06:55:37.000000000 +0200 +++ bsd/netmeter.cc @@@@ -38,6 +38,7 @@@@ NetMeter::NetMeter( XOSView *parent, flo netBandwidth_ = max; total_ = netBandwidth_; _lastBytesIn = _lastBytesOut = 0; + netIface_ = "False"; BSDGetNetInOut (&_lastBytesIn, &_lastBytesOut); } } @@@@ -56,6 +57,7 @@@@ void NetMeter::checkResources( void ){ dodecay_ = parent_->isResourceTrue("netDecay"); useGraph_ = parent_->isResourceTrue("netGraph"); SetUsedFormat (parent_->getResource("netUsedFormat")); + netIface_ = parent_->getResource( "netIface" ); } } @ 1.8 log @- Make myself the MAINTAINER - Fix the manpage path in the Makefile - Adapt the memmeter.cc changes to pagemeter so it doesn't use kmem to get uvmexp. - struct schedstate_percpu is no longer a public interface outside the kernel - Add netIface support for NetBSD. Now you can monitor only one network interface. See the manpage for more details. This change is allready present in the sourceforge tree. - PKGREVISION++ @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @Update xosview to version 1.8.1alpha, from a nudge by Brian Grayson. Fixes build on NetBSD-1.6.2 and NetBSD-1.6ZE. Existing patches have either been incorporated or are unnecessary. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.6 2002/12/11 21:38:06 christos Exp $ d3 16 a18 68 --- bsd/kernel.cc.orig Tue Feb 16 09:09:21 1999 +++ bsd/kernel.cc Wed Dec 11 16:34:46 2002 @@@@ -30,6 +30,10 @@@@ #include #include /* For CPUSTATES, which tells us how many cpu states there are. */ +#if defined(XOSVIEW_NETBSD) && !defined(CPUSTATES) +#include +#endif + #ifndef XOSVIEW_FREEBSD #include /* For disk statistics. */ #endif @@@@ -60,14 +64,22 @@@@ #include #include #include +#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 105010000 /* > 1.5A */ +#include +#else #include /* XXX Is this needed? */ +#endif #else #include /* For struct vmmeter. */ #endif #ifdef HAVE_SWAPCTL #include /* For swapctl proto. */ -#include /* For swapent, SWAP_*. */ +#if defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104000000 +#include /* For swapent, SWAP_*. */ +#else +#include +#endif #include /* For malloc(), free(). */ #endif @@@@ -85,7 +97,11 @@@@ // This struct has the list of all the symbols we want from the kernel. static struct nlist nlst[] = { +#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 104260000 /* > 1.4Z */ +{ "_ifnet" }, /* XXX: LZ! Don't renumber */ +#else { "_cp_time" }, +#endif #define CP_TIME_SYM_INDEX 0 { "_ifnet" }, #define IFNET_SYM_INDEX 1 @@@@ -293,7 +309,21 @@@@ if (!timeArray) errx (-1, "BSDGetCPUTimes(): passed pointer was null!\n"); if (CPUSTATES != 5) errx (-1, "Error: xosview for *BSD expects 5 cpu states!\n"); +#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 104260000 /* > 1.4Z */ + int mib[2]; + struct schedstate_percpu ssp; + size_t size = sizeof(ssp.spc_cp_time); + mib[0] = CTL_KERN; + mib[1] = KERN_CP_TIME; + if (sysctl(mib, 2, ssp.spc_cp_time, &size, NULL, 0) < 0) { + printf("can't get schedstate_percpu: %s\n", strerror(errno)); + memset(&ssp, 0, sizeof(ssp)); + } + for (size = 0; size < CPUSTATES; size++) + timeArray[size] = (long) ssp.spc_cp_time[size]; +#else safe_kvm_read_symbol (CP_TIME_SYM_INDEX, timeArray, sizeof (long) * CPUSTATES); +#endif a20 13 @@@@ -651,7 +681,11 @@@@ while (kvmdiskptr != NULL) { safe_kvm_read ((u_long)kvmdiskptr, &kvmcurrdisk, sizeof(kvmcurrdisk)); /* Add up the contribution from this disk. */ +#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 106070000 /* > 1.6G */ + *bytesXferred += kvmcurrdisk.dk_rbytes + kvmcurrdisk.dk_wbytes; +#else *bytesXferred += kvmcurrdisk.dk_bytes; +#endif #ifdef DEBUG printf ("Got %#x (lower 32bits)\n", (int) (*bytesXferred & 0xffffffff)); #endif @ 1.6 log @put the one line change needed to make this work under /current. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.5 2000/08/18 22:43:53 christos Exp $ @ 1.5 log @Fix cp_time shit that broke post 1.4Z Fix uvm -> vm conversion lossage that broke post 1.5B Works with 1.5E and earlier. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.4 2000/06/27 08:15:51 tron Exp $ d4 1 a4 1 +++ bsd/kernel.cc Fri Aug 18 18:36:14 2000 d74 12 @ 1.4 log @Fix "xosview" to build under NetBSD 1.5 again. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- bsd/kernel.cc.orig Tue Feb 16 15:09:21 1999 +++ bsd/kernel.cc Tue Jun 27 10:13:23 2000 d16 12 a27 1 @@@@ -67,7 +71,11 @@@@ d39 34 @ 1.3 log @use on NetBSD 1.4 and later. @ text @d3 14 a16 3 --- bsd/kernel.cc.orig Wed Feb 17 01:09:21 1999 +++ bsd/kernel.cc Thu Apr 13 18:37:29 2000 @@@@ -67,7 +67,11 @@@@ @ 1.2 log @Update xosview to 1.6.0 using patches supplied by Brian Grayson, fixes PR pkg/5461. @ text @d1 5 a5 5 --- netbsd/kernel.h.orig Tue Mar 3 18:24:35 1998 +++ netbsd/kernel.h Sun Mar 1 17:04:45 1998 @@@@ -37,8 +37,13 @@@@ void NetBSDPageInit(); d7 5 a11 3 +#if defined(UVM) +void +NetBSDGetPageStats(struct uvmexp* vmp); d13 1 a13 2 void NetBSDGetPageStats(struct vmmeter* vmp); d15 2 a17 2 void NetBSDCPUInit(); @ 1.1 log @Patches from Mario Kemper to make xosview work with UVM. Munged around by me to: + make it work with old VM as well as UVM. + cut down the context in two of the patches to miss out Id strings. @ text @@