CVS commit: [netbsd-5] src/usr.bin/systat

[Manuel Bouyer]

Module Name:    src
Committed By:   bouyer
Date:           Tue Oct 27 21:37:52 UTC 2009

Modified Files:
        src/usr.bin/systat [netbsd-5]: syscall.c vmstat.c

Log Message:
Pull up following revision(s) (requested by wiz in ticket #1110):
        usr.bin/systat/vmstat.c: revision 1.74
        usr.bin/systat/syscall.c: revision 1.7
Fix problems with SIGWINCH. From Paul Ripke in PR 42161.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.6.1 src/usr.bin/systat/syscall.c
cvs rdiff -u -r1.71 -r1.71.4.1 src/usr.bin/systat/vmstat.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/systat/syscall.c
diff -u src/usr.bin/systat/syscall.c:1.5 src/usr.bin/systat/syscall.c:1.5.6.1
--- src/usr.bin/systat/syscall.c:1.5	Tue Apr 29 06:53:04 2008
+++ src/usr.bin/systat/syscall.c	Tue Oct 27 21:37:52 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: syscall.c,v 1.5 2008/04/29 06:53:04 martin Exp $	*/
+/*	$NetBSD: syscall.c,v 1.5.6.1 2009/10/27 21:37:52 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: syscall.c,v 1.5 2008/04/29 06:53:04 martin Exp $");
+__RCSID("$NetBSD: syscall.c,v 1.5.6.1 2009/10/27 21:37:52 bouyer Exp $");
 
 /* System call stats */
 
@@ -201,9 +201,8 @@
 		etime = cur.cp_etime;
 		/* < 5 ticks - ignore this trash */
 		if ((etime * hertz) < 1.0) {
-			if (failcnt++ > MAXFAIL)
+			if (failcnt++ <= MAXFAIL)
 				return;
-			failcnt = 0;
 			clear();
 			mvprintw(2, 10, "The alternate system clock has died!");
 			mvprintw(3, 10, "Reverting to ``pigs'' display.");

Index: src/usr.bin/systat/vmstat.c
diff -u src/usr.bin/systat/vmstat.c:1.71 src/usr.bin/systat/vmstat.c:1.71.4.1
--- src/usr.bin/systat/vmstat.c:1.71	Sun Jul 13 20:07:48 2008
+++ src/usr.bin/systat/vmstat.c	Tue Oct 27 21:37:52 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmstat.c,v 1.71 2008/07/13 20:07:48 dholland Exp $	*/
+/*	$NetBSD: vmstat.c,v 1.71.4.1 2009/10/27 21:37:52 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1983, 1989, 1992, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
 #endif
-__RCSID("$NetBSD: vmstat.c,v 1.71 2008/07/13 20:07:48 dholland Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.71.4.1 2009/10/27 21:37:52 bouyer Exp $");
 #endif /* not lint */
 
 /*
@@ -498,7 +498,7 @@
 		etime = cur.cp_etime;
 		/* < 5 ticks - ignore this trash */
 		if ((etime * hertz) < 1.0) {
-			if (failcnt++ > MAXFAIL)
+			if (failcnt++ <= MAXFAIL)
 				return;
 			clear();
 			mvprintw(2, 10, "The alternate system clock has died!");