From owner-freebsd-hackers Tue Jan 27 07:50:58 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id HAA08392 for hackers-outgoing; Tue, 27 Jan 1998 07:50:58 -0800 (PST) (envelope-from owner-freebsd-hackers@FreeBSD.ORG) Received: from ifi.uio.no (0@ifi.uio.no [129.240.64.2]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id HAA08334 for ; Tue, 27 Jan 1998 07:50:49 -0800 (PST) (envelope-from dag-erli@ifi.uio.no) Received: from grjottunagard.ifi.uio.no (2602@grjottunagard.ifi.uio.no [129.240.64.131]) by ifi.uio.no (8.8.8/8.8.7/ifi0.2) with ESMTP id QAA00057; Tue, 27 Jan 1998 16:50:44 +0100 (MET) Received: (from dag-erli@localhost) by grjottunagard.ifi.uio.no ; Tue, 27 Jan 1998 16:50:44 +0100 (MET) To: Mike Smith Cc: joelh@gnu.org, hackers@FreeBSD.ORG Subject: Re: File I/O in kernel land (was: Re: 2nd warning: 2.2.6 BETA begins in 10 days!) References: <199801271512.BAA00461@word.smith.net.au> Organization: Gutteklubben Terrasse X-url: http://www.ifi.uio.no/~dag-erli/ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit From: dag-erli@ifi.uio.no (Dag-Erling Coidan Smørgrav) Date: 27 Jan 1998 16:50:43 +0100 In-Reply-To: Mike Smith's message of "Wed, 28 Jan 1998 01:42:49 +1030" Message-ID: Lines: 42 X-Mailer: Gnus v5.5/Emacs 19.34 Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk Mike Smith writes: > 3 establish/disestablish your own timer routine when you are > activated/deactivated (bad again because the remove-saver option > is hidden behind the UNKNOWN_MODE test in scrn_timer()). > > I would actually combine 3 above with moving the "should we stop the > screensaver" test to before the UNKNOWN_MODE bailout in scrn_timer(). After due consideration, I think that's what I'll do. Here's a patch to syscons.c: --- syscons.c.orig Tue Jan 27 16:49:04 1998 +++ syscons.c Tue Jan 27 16:49:53 1998 @@ -2187,17 +2187,17 @@ scintr(0); } + /* should we stop the screen saver? */ + if (mono_time.tv_sec <= scrn_time_stamp + scrn_blank_time) + if (scrn_blanked > 0) + stop_scrn_saver(current_saver); + /* should we just return ? */ if ((scp->status&UNKNOWN_MODE) || blink_in_progress || switch_in_progress) { timeout(scrn_timer, NULL, hz / 10); splx(s); return; } - - /* should we stop the screen saver? */ - if (mono_time.tv_sec <= scrn_time_stamp + scrn_blank_time) - if (scrn_blanked > 0) - stop_scrn_saver(current_saver); if (scrn_blanked <= 0) { /* update screen image */ -- * Finrod (INTJ) * Unix weenie * dag-erli@ifi.uio.no * cellular +47-92835919 * RFC1123: "Be liberal in what you accept, and conservative in what you send"