From owner-p4-projects@FreeBSD.ORG  Wed Apr 26 10:29:47 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 99C8716A410; Wed, 26 Apr 2006 10:29:47 +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 6791E16A404
	for <perforce@freebsd.org>; Wed, 26 Apr 2006 10:29:47 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A7AE643D69
	for <perforce@freebsd.org>; Wed, 26 Apr 2006 10:29:40 +0000 (GMT)
	(envelope-from jb@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 k3QATdlB059979
	for <perforce@freebsd.org>; Wed, 26 Apr 2006 10:29:40 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3QATdP5059961
	for perforce@freebsd.org; Wed, 26 Apr 2006 10:29:39 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 26 Apr 2006 10:29:39 GMT
Message-Id: <200604261029.k3QATdP5059961@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 96147 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: Wed, 26 Apr 2006 10:29:47 -0000

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

Change 96147 by jb@jb_freebsd2 on 2006/04/26 10:28:58

	Unhack. pthread_cond_reltimedwait_np was easily recoded in the one
	place where it was used.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/compat/thread.h#4 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/compat/thread.h#4 (text+ko) ====

@@ -54,23 +54,4 @@
 #define RW_WRITE_HELD(_a)	pthread_rwlock_wrheld_np(_a)
 #define	RW_LOCK_HELD(x)		(RW_READ_HELD(x) || RW_WRITE_HELD(x))
 
-#define timespecadd(vvp, uvp)						\
-	do {								\
-		(vvp)->tv_sec += (uvp)->tv_sec;				\
-		(vvp)->tv_nsec += (uvp)->tv_nsec;			\
-		if ((vvp)->tv_nsec >= 1000000000) {			\
-			(vvp)->tv_sec++;				\
-			(vvp)->tv_nsec -= 1000000000;			\
-		}							\
-	} while (0)
-
-static __inline int pthread_cond_reltimedwait_np(pthread_cond_t *cvp,
-	pthread_mutex_t *mp, const struct timespec *reltime)
-{
-	struct timespec ts;
-	clock_gettime(CLOCK_REALTIME,&ts);
-	timespecadd(&ts,reltime);
-	return(pthread_cond_timedwait(cvp, mp, &ts));
-}
-
 #endif