OpenBSD CVS

CVS log for src/usr.bin/vmstat/dkstats.c


[BACK] Up to [local] / src / usr.bin / vmstat

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.42 / (download) - annotate - [select for diffs], Mon May 6 16:54:22 2024 UTC (12 days, 12 hours ago) by cheloha
Branch: MAIN
CVS Tags: HEAD
Changes since 1.41: +6 -13 lines
Diff to previous 1.41 (colored)

vmstat/dkstats.c: remove obfuscatory timerset() macro

Using a macro to perform a plain struct assignment obfuscates the
obvious.  Delete the timerset() macro.

While here, remove some superfluous timerclear(3) calls.

Thread: https://marc.info/?l=openbsd-tech&m=171346446031940&w=2

ok millert@

Revision 1.41 / (download) - annotate - [select for diffs], Fri Jun 28 13:35:05 2019 UTC (4 years, 10 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.40: +12 -12 lines
Diff to previous 1.40 (colored)

When system calls indicate an error they return -1, not some arbitrary
value < 0.  errno is only updated in this case.  Change all (most?)
callers of syscalls to follow this better, and let's see if this strictness
helps us in the future.

Revision 1.40 / (download) - annotate - [select for diffs], Tue May 30 05:57:46 2017 UTC (6 years, 11 months ago) by tedu
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.39: +7 -7 lines
Diff to previous 1.39 (colored)

rename variable to avoid shadow. from Brian Callahan

Revision 1.39 / (download) - annotate - [select for diffs], Sun Sep 4 14:21:05 2016 UTC (7 years, 8 months ago) by tb
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.38: +53 -53 lines
Diff to previous 1.38 (colored)

straightforward realloc -> reallocarray conversion

ok deraadt, guenther, tedu

Revision 1.38 / (download) - annotate - [select for diffs], Thu Dec 24 03:25:08 2015 UTC (8 years, 4 months ago) by mmcc
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.37: +6 -6 lines
Diff to previous 1.37 (colored)

Replace bzero with memset. No binary change.

ok tb@

Revision 1.37 / (download) - annotate - [select for diffs], Fri Jan 16 06:40:14 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.36: +1 -2 lines
Diff to previous 1.36 (colored)

Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible.  Annotate <sys/param.h> lines with their current reasons.  Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc.  Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution.  These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)

Revision 1.36 / (download) - annotate - [select for diffs], Mon Sep 15 19:08:22 2014 UTC (9 years, 8 months ago) by miod
Branch: MAIN
Changes since 1.35: +2 -2 lines
Diff to previous 1.35 (colored)

Remove non-standard <sys/dkstat.h> header. It has not contained anything
related to disk stastics for almost 17 years, and the remaining
userland-visible defines duplicate those found in <sys/sched.h>.

Move the remaining _KERNEL defines to <sys/tty.h> where they belong, and
update all users to cope with this.

ok kettenis@

Revision 1.35 / (download) - annotate - [select for diffs], Fri Sep 24 00:11:15 2010 UTC (13 years, 7 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5, OPENBSD_5_4_BASE, OPENBSD_5_4, OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2, OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9
Changes since 1.34: +13 -2 lines
Diff to previous 1.34 (colored)

Now that HW_DISKNAMES returns xx0: or xx0:uid entries, we must truncate
the : and uid components out -- otherwise these two programs will work
poorly.

Revision 1.34 / (download) - annotate - [select for diffs], Tue Jul 20 19:43:19 2010 UTC (13 years, 10 months ago) by lum
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.33: +1 -11 lines
Diff to previous 1.33 (colored)

Remove setresguid since it is no longer needed.
ok matthew@ millert@ deraadt@

Revision 1.33 / (download) - annotate - [select for diffs], Mon Nov 26 09:28:34 2007 UTC (16 years, 5 months ago) by martynas
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7, OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5, OPENBSD_4_4_BASE, OPENBSD_4_4, OPENBSD_4_3_BASE, OPENBSD_4_3
Changes since 1.32: +2 -2 lines
Diff to previous 1.32 (colored)

typos;  ok jmc@
sys/netinet/in_pcb.c and sys/net/bridgestp.c ok henning@
sys/dev/pci/bktr/* ok jakemsr@

Revision 1.32 / (download) - annotate - [select for diffs], Wed Oct 24 20:15:43 2007 UTC (16 years, 6 months ago) by chl
Branch: MAIN
Changes since 1.31: +19 -1 lines
Diff to previous 1.31 (colored)

add missing checks against NULL after realloc calls

Ok gilles@ moritz@

Revision 1.31 / (download) - annotate - [select for diffs], Tue Oct 23 07:35:58 2007 UTC (16 years, 6 months ago) by chl
Branch: MAIN
Changes since 1.30: +7 -6 lines
Diff to previous 1.30 (colored)

add missing checks against NULL on last.dk_rbytes and last.dk_wbytes
reorder operations to make it easier to read and check

From Igor Zinovik <zinovik@cs.karelia.ru>

"looks ok" otto@ "looks correct" ray@ ok gilles@ "looks fine" moritz@

Revision 1.30 / (download) - annotate - [select for diffs], Fri Mar 31 18:19:38 2006 UTC (18 years, 1 month ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE, OPENBSD_4_2, OPENBSD_4_1_BASE, OPENBSD_4_1, OPENBSD_4_0_BASE, OPENBSD_4_0
Changes since 1.29: +7 -7 lines
Diff to previous 1.29 (colored)

spacing

Revision 1.29 / (download) - annotate - [select for diffs], Fri Mar 31 04:06:13 2006 UTC (18 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.28: +21 -17 lines
Diff to previous 1.28 (colored)

lint-driven cleanup.  nothing too scary in this diff.

Revision 1.28 / (download) - annotate - [select for diffs], Mon Mar 13 19:29:26 2006 UTC (18 years, 2 months ago) by otto
Branch: MAIN
Changes since 1.27: +4 -4 lines
Diff to previous 1.27 (colored)

delint; from David Hill

Revision 1.27 / (download) - annotate - [select for diffs], Mon Oct 17 19:04:20 2005 UTC (18 years, 7 months ago) by otto
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE, OPENBSD_3_9
Changes since 1.26: +4 -4 lines
Diff to previous 1.26 (colored)

Use queue macros instead of directly accessing fields. ok pat@ "put it
in" deraadt@

Revision 1.26 / (download) - annotate - [select for diffs], Mon Jul 4 01:54:10 2005 UTC (18 years, 10 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_3_8_BASE, OPENBSD_3_8
Changes since 1.25: +9 -7 lines
Diff to previous 1.25 (colored)

make these use setres[ug]id for simple privilege dropping;
ok deraadt@ millert@ moritz@

Revision 1.25 / (download) - annotate - [select for diffs], Thu Apr 22 22:28:37 2004 UTC (20 years, 1 month ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_7_BASE, OPENBSD_3_7, OPENBSD_3_6_BASE, OPENBSD_3_6
Changes since 1.24: +3 -3 lines
Diff to previous 1.24 (colored)

Fix pasto in realloc portion of dkreadstats; from Pedro Martelletto
OK drahn@

Revision 1.24 / (download) - annotate - [select for diffs], Sun Feb 15 02:45:47 2004 UTC (20 years, 3 months ago) by tedu
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE, OPENBSD_3_5
Changes since 1.23: +77 -40 lines
Diff to previous 1.23 (colored)

new arg to disk_unbusy, to record separate read/write statistics.
looked at by various, testing henning@ mcbride@ dan weeks
mostly from netbsd via Pedro Martelletto <pbastos@rdc.puc-rio.br>

Revision 1.23 / (download) - annotate - [select for diffs], Wed Jun 18 04:13:10 2003 UTC (20 years, 11 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE, OPENBSD_3_4
Changes since 1.22: +6 -9 lines
Diff to previous 1.22 (colored)

Add missing check for i < dk_ndrive in 2 loops; closes PR 3322

Revision 1.22 / (download) - annotate - [select for diffs], Mon Dec 16 01:57:04 2002 UTC (21 years, 5 months ago) by tdeval
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE, OPENBSD_3_3
Changes since 1.21: +162 -25 lines
Diff to previous 1.21 (colored)

Make systat(1), iostat(8) and vmstat(8) automatically update their disk
statistics when a device is added/removed.  ok deraadt@

Revision 1.21 / (download) - annotate - [select for diffs], Tue Sep 17 19:37:40 2002 UTC (21 years, 8 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_2_BASE, OPENBSD_3_2
Changes since 1.20: +5 -8 lines
Diff to previous 1.20 (colored)

ansi

Revision 1.20 / (download) - annotate - [select for diffs], Sun Aug 4 00:51:01 2002 UTC (21 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.19: +12 -3 lines
Diff to previous 1.19 (colored)

only open kvm once between these two

Revision 1.19 / (download) - annotate - [select for diffs], Fri Jun 28 22:40:53 2002 UTC (21 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.18: +9 -1 lines
Diff to previous 1.18 (colored)

wrap NOKVM variables too

Revision 1.18 / (download) - annotate - [select for diffs], Wed Jun 19 08:45:52 2002 UTC (21 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.17: +14 -14 lines
Diff to previous 1.17 (colored)

mark which nlist[] kmem entries are not needed in the sysctl case, and which are

Revision 1.17 / (download) - annotate - [select for diffs], Sat Jun 8 02:33:32 2002 UTC (21 years, 11 months ago) by drahn
Branch: MAIN
Changes since 1.16: +2 -2 lines
Diff to previous 1.16 (colored)

Missing newline at end of file. from krause

Revision 1.16 / (download) - annotate - [select for diffs], Thu May 23 10:35:07 2002 UTC (22 years ago) by deraadt
Branch: MAIN
Changes since 1.15: +30 -20 lines
Diff to previous 1.15 (colored)

if NOKVM is defined, do not do the KVM stuff at all

Revision 1.15 / (download) - annotate - [select for diffs], Sat Feb 16 21:27:58 2002 UTC (22 years, 3 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_1_BASE, OPENBSD_3_1
Changes since 1.14: +2 -2 lines
Diff to previous 1.14 (colored)

Part one of userland __P removal.  Done with a simple regexp with some minor hand editing to make comments line up correctly.  Another pass is forthcoming that handles the cases that could not be done automatically.

Revision 1.14 / (download) - annotate - [select for diffs], Sat Jul 21 09:21:56 2001 UTC (22 years, 10 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE, OPENBSD_3_0
Changes since 1.13: +3 -2 lines
Diff to previous 1.13 (colored)

plug mem leak; zero right amount of mem

Revision 1.13 / (download) - annotate - [select for diffs], Sun Jun 3 03:31:30 2001 UTC (22 years, 11 months ago) by angelos
Branch: MAIN
Changes since 1.12: +11 -10 lines
Diff to previous 1.12 (colored)

Read struct diskstats from the kernel.

Revision 1.12 / (download) - annotate - [select for diffs], Mon May 14 07:40:39 2001 UTC (23 years ago) by angelos
Branch: MAIN
Changes since 1.11: +3 -3 lines
Diff to previous 1.11 (colored)

No need to use calloc gratuitously.

Revision 1.11 / (download) - annotate - [select for diffs], Mon May 14 07:24:12 2001 UTC (23 years ago) by angelos
Branch: MAIN
Changes since 1.10: +6 -6 lines
Diff to previous 1.10 (colored)

Use warn() consistently.

Revision 1.10 / (download) - annotate - [select for diffs], Mon May 14 07:20:50 2001 UTC (23 years ago) by angelos
Branch: MAIN
Changes since 1.9: +136 -44 lines
Diff to previous 1.9 (colored)

Use the sysctl-based diskstats for live kernels. deraadt@ ok

Revision 1.9 / (download) - annotate - [select for diffs], Tue Jan 2 20:09:02 2001 UTC (23 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE, OPENBSD_2_9
Changes since 1.8: +6 -4 lines
Diff to previous 1.8 (colored)

check for another allocation failure

Revision 1.6.4.1 / (download) - annotate - [select for diffs], Fri Oct 6 21:16:17 2000 UTC (23 years, 7 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.6: +2 -2 lines
Diff to previous 1.6 (colored) next main 1.7 (colored)

Pull in patch from current (even more to come):
Fix (millert):
warnx?/errx? paranoia (use "%s" not a bare string unless it is a
constant).  These are not security holes but it is worth fixing
them anyway both for robustness and so folks looking for examples
in the tree are not misled into doing something potentially dangerous.
Furthermore, it is a bad idea to assume that pathnames will not
include '%' in them and that error routines don't return strings
with '%' in them (especially in light of the possibility of locales).

Revision 1.8 / (download) - annotate - [select for diffs], Tue Oct 3 03:12:16 2000 UTC (23 years, 7 months ago) by aaron
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE, OPENBSD_2_8
Changes since 1.7: +2 -2 lines
Diff to previous 1.7 (colored)

More format string paranoia; deraadt@ ok

Revision 1.7 / (download) - annotate - [select for diffs], Fri Jun 30 16:00:22 2000 UTC (23 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.6: +2 -2 lines
Diff to previous 1.6 (colored)

warnx?/errx? paranoia (use "%s" not a bare string unless it is a
constant).  These are not security holes but it is worth fixing
them anyway both for robustness and so folks looking for examples
in the tree are not misled into doing something potentially dangerous.
Furthermore, it is a bad idea to assume that pathnames will not
include '%' in them and that error routines don't return strings
with '%' in them (especially in light of the possibility of locales).

Revision 1.6 / (download) - annotate - [select for diffs], Mon Jun 21 20:48:01 1999 UTC (24 years, 11 months ago) by art
Branch: MAIN
CVS Tags: OPENBSD_2_7_BASE, OPENBSD_2_6_BASE, OPENBSD_2_6
Branch point for: OPENBSD_2_7
Changes since 1.5: +2 -2 lines
Diff to previous 1.5 (colored)

stop casting the third argument to kvm_read to char *. it is a void *.

Revision 1.5 / (download) - annotate - [select for diffs], Mon Jun 23 22:11:07 1997 UTC (26 years, 11 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_2_5_BASE, OPENBSD_2_5, OPENBSD_2_4_BASE, OPENBSD_2_4, OPENBSD_2_3_BASE, OPENBSD_2_3, OPENBSD_2_2_BASE, OPENBSD_2_2
Changes since 1.4: +1 -4 lines
Diff to previous 1.4 (colored)

Move prototypes into dkstats.h so systat can get at them.

Revision 1.4 / (download) - annotate - [select for diffs], Tue Feb 4 04:51:20 1997 UTC (27 years, 3 months ago) by kstailey
Branch: MAIN
CVS Tags: OPENBSD_2_1_BASE, OPENBSD_2_1
Changes since 1.3: +0 -3 lines
Diff to previous 1.3 (colored)

deleted warnx() about "no drives attached" since dkinit() is used in curses apps like systat

Revision 1.3 / (download) - annotate - [select for diffs], Wed Jun 26 05:42:40 1996 UTC (27 years, 10 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_0_BASE, OPENBSD_2_0
Changes since 1.2: +1 -0 lines
Diff to previous 1.2 (colored)

rcsid

Revision 1.2 / (download) - annotate - [select for diffs], Wed May 22 11:35:42 1996 UTC (28 years ago) by deraadt
Branch: MAIN
Changes since 1.1: +4 -4 lines
Diff to previous 1.1 (colored)

libutil

Revision 1.1 / (download) - annotate - [select for diffs], Sun Mar 3 02:51:20 1996 UTC (28 years, 2 months ago) by tholo
Branch: MAIN

Working disk statistics; NetBSD PR 2160

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.