Module Name:    src
Committed By:   wiz
Date:           Wed Oct 21 13:56:36 UTC 2009

Modified Files:
        src/usr.bin/systat: syscall.c vmstat.c

Log Message:
Fix problems with SIGWINCH. From Paul Ripke in PR 42161.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/systat/syscall.c
cvs rdiff -u -r1.73 -r1.74 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.6 src/usr.bin/systat/syscall.c:1.7
--- src/usr.bin/systat/syscall.c:1.6	Mon Apr 13 23:20:27 2009
+++ src/usr.bin/systat/syscall.c	Wed Oct 21 13:56:36 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: syscall.c,v 1.6 2009/04/13 23:20:27 lukem Exp $	*/
+/*	$NetBSD: syscall.c,v 1.7 2009/10/21 13:56:36 wiz Exp $	*/
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: syscall.c,v 1.6 2009/04/13 23:20:27 lukem Exp $");
+__RCSID("$NetBSD: syscall.c,v 1.7 2009/10/21 13:56:36 wiz 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.73 src/usr.bin/systat/vmstat.c:1.74
--- src/usr.bin/systat/vmstat.c:1.73	Mon Apr 13 23:20:27 2009
+++ src/usr.bin/systat/vmstat.c	Wed Oct 21 13:56:36 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmstat.c,v 1.73 2009/04/13 23:20:27 lukem Exp $	*/
+/*	$NetBSD: vmstat.c,v 1.74 2009/10/21 13:56:36 wiz 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.73 2009/04/13 23:20:27 lukem Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.74 2009/10/21 13:56:36 wiz 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!");

Reply via email to