From owner-p4-projects@FreeBSD.ORG  Mon Nov 29 23:08:52 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A080B16A4D0; Mon, 29 Nov 2004 23:08:52 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7A33216A4CE
	for <perforce@freebsd.org>; Mon, 29 Nov 2004 23:08:52 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6A63C43D58
	for <perforce@freebsd.org>; Mon, 29 Nov 2004 23:08:52 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iATN8qB3037296
	for <perforce@freebsd.org>; Mon, 29 Nov 2004 23:08:52 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iATN8q46037293
	for perforce@freebsd.org; Mon, 29 Nov 2004 23:08:52 GMT
	(envelope-from peter@freebsd.org)
Date: Mon, 29 Nov 2004 23:08:52 GMT
Message-Id: <200411292308.iATN8q46037293@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 66066 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Nov 2004 23:08:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=66066

Change 66066 by peter@peter_daintree on 2004/11/29 23:08:30

	Really fix the timeout calculation.  This should even be bde-proof.

Affected files ...

.. //depot/projects/hammer/sys/kern/tty.c#37 edit

Differences ...

==== //depot/projects/hammer/sys/kern/tty.c#37 (text+ko) ====

@@ -1854,16 +1854,13 @@
 #undef diff
 		/*
 		 * Rounding down may make us wake up just short
-		 * of the target, so we round up.
+		 * of the target, so we round up.  The 32 bit arithmetic is
+		 * sufficient for the first calculation for hz < 169.
 		 */
-		if (slp <= LONG_MAX / 1000000)
-			slp = (slp * 1000000 + (tick - 1)) / tick + 1;
-		else if (slp <= LONG_MAX / hz)
-			slp = slp * hz + 1;
+		if (sizeof(u_long) > 4 || slp <= ULONG_MAX / hz)
+			slp = slp = (((u_long)slp * hz) + 999999) / 1000000;
 		else
-			slp = LONG_MAX;
-		if (slp > INT_MAX)
-			slp = INT_MAX;
+			slp = (slp + (tick - 1)) / tick;
 		goto sleep;
 	}
 	if (qp->c_cc <= 0) {