head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.28 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.26 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.24 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.22 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.20 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.18 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.16 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.14 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.12 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.10 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.8 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.6 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.4 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.2 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.1.1.1.0.24 pkgsrc-2006Q4-base:1.1.1.1 pkgsrc-2006Q3:1.1.1.1.0.22 pkgsrc-2006Q3-base:1.1.1.1 pkgsrc-2006Q2:1.1.1.1.0.20 pkgsrc-2006Q2-base:1.1.1.1 pkgsrc-2006Q1:1.1.1.1.0.18 pkgsrc-2006Q1-base:1.1.1.1 pkgsrc-2005Q4:1.1.1.1.0.16 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.14 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.12 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.10 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.8 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.6 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.4 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.2 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2007.04.01.21.36.32; author wiz; state dead; branches; next 1.1; 1.1 date 2004.02.24.22.06.57; author cube; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.02.24.22.06.57; author cube; state Exp; branches; next ; desc @@ 1.2 log @Remove gkrellm1 and its dependencies from pkgsrc. This has been replaced ages ago with gkrellm version 2. No disagreement on pkgsrc-users. @ text @$NetBSD: patch-ac,v 1.1 2004/02/24 22:06:57 cube Exp $ --- src/disk.c.orig Tue Jan 1 15:08:07 2002 +++ src/disk.c @@@@ -446,10 +446,24 @@@@ * d.xfer value (number of transfers) but there a scaling problem: * d.xfer is usually much more smaller thant d.dk_bytes... */ + /* Separate read/write stats were implemented in NetBSD 1.6K. */ + disk = (DiskMon *) list->data; - disk->rblk = d.dk_bytes / 512; /* block size hardcoded : - * d.dk_byteshift is always 0 ?? */ +#if __NetBSD_Version__ >= 106110000 + /* d.dk_byteshift is not set in, or used, by the kernel as of + * NetBSD 1.6K, but maybe one day... In the meantime, NetBSD + * only supports a blocksize of 512 == 2^^9, so assume that. */ + if (d.dk_byteshift == 0) { + disk->rblk = d.dk_rbytes >> 9; + disk->wblk = d.dk_wbytes >> 9; + } else { + disk->rblk = d.dk_rbytes / d.dk_byteshift; + disk->wblk = d.dk_wbytes / d.dk_byteshift; + } +#else + disk->rblk = d.dk_bytes >> 9; disk->wblk = 0; +#endif composite_disk->rblk += disk->rblk; composite_disk->wblk += disk->wblk; /* useless, isn't it ? :-D */ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2002/11/07 15:07:46 fredb Exp $ @ 1.1.1.1 log @Re-import GKrellM-1 as sysutils/gkrellm1. @ text @@