From owner-p4-projects@FreeBSD.ORG  Sun Mar 20 13:51:31 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3C8F316A4DD; Sun, 20 Mar 2005 13:51:31 +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 8280116A4D3
	for <perforce@freebsd.org>; Sun, 20 Mar 2005 13:51:30 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5497543D48
	for <perforce@freebsd.org>; Sun, 20 Mar 2005 13:51:30 +0000 (GMT)
	(envelope-from davidxu@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 j2KDpUHO013405
	for <perforce@freebsd.org>; Sun, 20 Mar 2005 13:51:30 GMT
	(envelope-from davidxu@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2KDpUnG013401
	for perforce@freebsd.org; Sun, 20 Mar 2005 13:51:30 GMT
	(envelope-from davidxu@freebsd.org)
Date: Sun, 20 Mar 2005 13:51:30 GMT
Message-Id: <200503201351.j2KDpUnG013401@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	davidxu@freebsd.org using -f
From: David Xu <davidxu@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 73587 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: Sun, 20 Mar 2005 13:51:32 -0000

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

Change 73587 by davidxu@davidxu_alona on 2005/03/20 13:51:28

	Calculate relative timeout value.

Affected files ...

.. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#13 edit

Differences ...

==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sem.c#13 (text+ko) ====

@@ -205,6 +205,7 @@
 int
 _sem_timedwait(sem_t * __restrict sem, struct timespec * __restrict abstime)
 {
+	struct timespec ts, ts2;
 	struct pthread *curthread;
 	int val, oldcancel, retval;
 
@@ -233,8 +234,10 @@
 			errno = EINVAL;
 			return (-1);
 		}
+		clock_gettime(CLOCK_REALTIME, &ts);
+		TIMESPEC_SUB(&ts2, abstime, &ts);
 		oldcancel = _thr_cancel_enter(curthread);
-		retval = _thr_umtx_wait((umtx_t *)&(*sem)->count, 0, abstime);
+		retval = _thr_umtx_wait((umtx_t *)&(*sem)->count, 0, &ts2);
 		_thr_cancel_leave(curthread, oldcancel);
 	} while (retval == 0);
 	errno = retval;