From owner-p4-projects@FreeBSD.ORG  Wed Jan  5 14:15:07 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C11F416A4D0; Wed,  5 Jan 2005 14:15:06 +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 98C7816A4CE
	for <perforce@freebsd.org>; Wed,  5 Jan 2005 14:15:06 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 818A243D1F
	for <perforce@freebsd.org>; Wed,  5 Jan 2005 14:15:06 +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 j05EF6Mo013043
	for <perforce@freebsd.org>; Wed, 5 Jan 2005 14:15:06 GMT
	(envelope-from davidxu@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j05EF6Jp013040
	for perforce@freebsd.org; Wed, 5 Jan 2005 14:15:06 GMT
	(envelope-from davidxu@freebsd.org)
Date: Wed, 5 Jan 2005 14:15:06 GMT
Message-Id: <200501051415.j05EF6Jp013040@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 68319 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: Wed, 05 Jan 2005 14:15:07 -0000

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

Change 68319 by davidxu@davidxu_tiger on 2005/01/05 14:14:10

	Fix styles.
	add sem_getvalue.
	Update copyright.

Affected files ...

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

Differences ...

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

@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2005 David Xu <davidxu@freebsd.org>.
  * Copyright (C) 2000 Jason Evans <jasone@freebsd.org>.
  * All rights reserved.
  * 
@@ -43,6 +44,7 @@
 
 
 __weak_reference(_sem_init, sem_init);
+__weak_reference(_sem_getvalue, sem_getvalue);
 __weak_reference(_sem_trywait, sem_trywait);
 __weak_reference(_sem_wait, sem_wait);
 __weak_reference(_sem_timedwait, sem_timedwait);
@@ -108,6 +110,23 @@
 }
 
 int
+_sem_getvalue(sem_t * __restrict sem, int * __restrict sval)
+{
+	int retval;
+
+	if (sem_check_validity(sem) != 0)
+		return (-1);
+
+	if ((*sem)->syssem != 0)
+		retval = ksem_getvalue((*sem)->semid, sval);
+        else {
+		*sval = (int)(*sem)->count;
+		retval = 0;
+	}
+	return (retval);
+}
+
+int
 _sem_trywait(sem_t *sem)
 {
 	int val;
@@ -143,11 +162,11 @@
 		return (retval);
 	}
 
-	pthread_testcancel();
+	_pthread_testcancel();
 	do {
 		while ((val = (*sem)->count) > 0) {
-		    if (atomic_cmpset_acq_int(&(*sem)->count, val, val - 1))
-			return (0);
+			if (atomic_cmpset_acq_int(&(*sem)->count, val, val - 1))
+				return (0);
 		}
 		oldcancel = _thr_cancel_enter(curthread);
 		retval = umtx_wait((struct umtx *)&(*sem)->count, 0);
@@ -178,11 +197,11 @@
 	 * The timeout argument is only supposed to
 	 * be checked if the thread would have blocked.
 	 */
-	pthread_testcancel();
+	_pthread_testcancel();
 	do {
 		while ((val = (*sem)->count) > 0) {
-		    if (atomic_cmpset_acq_int(&(*sem)->count, val, val-1))
-			return (0);
+			if (atomic_cmpset_acq_int(&(*sem)->count, val, val - 1))
+				return (0);
 		}
 		if (abstime == NULL) {
 			errno = EINVAL;