From owner-p4-projects@FreeBSD.ORG  Sat Jul 22 11:39:35 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 22A1416A4E0; Sat, 22 Jul 2006 11:39:35 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
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 DCD3116A4DD
	for <perforce@FreeBSD.org>; Sat, 22 Jul 2006 11:39:34 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A811B43D46
	for <perforce@FreeBSD.org>; Sat, 22 Jul 2006 11:39:34 +0000 (GMT)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6MBdYM9029424
	for <perforce@FreeBSD.org>; Sat, 22 Jul 2006 11:39:34 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6MBdYOX029421
	for perforce@freebsd.org; Sat, 22 Jul 2006 11:39:34 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Sat, 22 Jul 2006 11:39:34 GMT
Message-Id: <200607221139.k6MBdYOX029421@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 102135 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 22 Jul 2006 11:39:35 -0000

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

Change 102135 by rdivacky@rdivacky_witten on 2006/07/22 11:39:07

	Fix the timeout_hz counting.

Affected files ...

.. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#6 edit

Differences ...

==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#6 (text+ko) ====

@@ -117,9 +117,24 @@
 		    		td->td_proc->p_pid, args->val, 
 		    		args->uaddr, val, timeout.tv_sec, timeout.tv_nsec); 
 #endif
-		tv.tv_usec = timeout.tv_sec * 1000 + timeout.tv_nsec / 1000000;
+		tv.tv_usec = timeout.tv_sec * 1000000 + timeout.tv_nsec / 1000;
 		timeout_hz = tvtohz(&tv);
 
+		if (timeout.tv_sec == 0 && timeout.tv_nsec == 0)
+		   	timeout_hz = 0;
+      		/*
+                 * If the user process requests a non null timeout,
+                 * make sure we do not turn it into an infinite
+                 * timeout because timeout_hz gets null.
+                 *
+                 * We use a minimal timeout of 1/hz. Mayve it would
+                 * make sense to just return ETIMEDOUT without sleeping.
+                 */
+                if (((timeout.tv_sec != 0) || (timeout.tv_nsec != 0)) &&
+                    (timeout_hz == 0))
+                        timeout_hz = 1;
+
+
 		f = futex_get(args->uaddr);
 		ret = futex_sleep(f, td, timeout_hz);
 		futex_put(f);