From owner-p4-projects@FreeBSD.ORG  Thu Jan  6 13:03:46 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A8EBE16A4CE; Thu,  6 Jan 2005 13:03:45 +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 6865316A4CE
	for <perforce@freebsd.org>; Thu,  6 Jan 2005 13:03:45 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 54A6343D2F
	for <perforce@freebsd.org>; Thu,  6 Jan 2005 13:03:45 +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 j06D3jtF012317
	for <perforce@freebsd.org>; Thu, 6 Jan 2005 13:03:45 GMT
	(envelope-from davidxu@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j06D3j7S012314
	for perforce@freebsd.org; Thu, 6 Jan 2005 13:03:45 GMT
	(envelope-from davidxu@freebsd.org)
Date: Thu, 6 Jan 2005 13:03:45 GMT
Message-Id: <200501061303.j06D3j7S012314@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 68384 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: Thu, 06 Jan 2005 13:03:46 -0000

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

Change 68384 by davidxu@davidxu_tiger on 2005/01/06 13:03:37

	add sem_destroy.

Affected files ...

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

Differences ...

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

@@ -44,6 +44,7 @@
 
 
 __weak_reference(_sem_init, sem_init);
+__weak_reference(_sem_destroy, sem_destroy);
 __weak_reference(_sem_getvalue, sem_getvalue);
 __weak_reference(_sem_trywait, sem_trywait);
 __weak_reference(_sem_wait, sem_wait);
@@ -78,6 +79,7 @@
 		errno = ENOSPC;
 		return (NULL);
 	}
+	umtx_init((struct umtx *)&sem->lock);
 	/*
 	 * Fortunatly count and nwaiters are adjacency, so we can
 	 * use umtx_wait to wait on it, umtx_wait needs an address
@@ -110,6 +112,29 @@
 }
 
 int
+_sem_destroy(sem_t *sem)
+{
+	int retval;
+
+	if (sem_check_validity(sem) != 0)
+		return (-1);
+
+	/*
+	 * If this is a system semaphore let the kernel track it otherwise
+	 * make sure there are no waiters.
+	 */
+	if ((*sem)->syssem != 0)
+		retval = ksem_destroy((*sem)->semid);
+	else {
+		retval = 0;
+		(*sem)->magic = 0;
+	}
+	if (retval == 0)
+		free(*sem);
+	return (retval);
+}
+
+int
 _sem_getvalue(sem_t * __restrict sem, int * __restrict sval)
 {
 	int retval;
@@ -208,7 +233,8 @@
 			return (-1);
 		}
 		oldcancel = _thr_cancel_enter(curthread);
-		retval = umtx_timedwait((struct umtx *)&(*sem)->count, 0, abstime);
+		retval = umtx_timedwait((struct umtx *)&(*sem)->count, 0,
+				abstime);
 		_thr_cancel_leave(curthread, oldcancel);
 	} while (retval == 0);
 	errno = retval;