From owner-p4-projects@FreeBSD.ORG  Fri Dec 31 15:09:28 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7D66F16A4D0; Fri, 31 Dec 2004 15:09:28 +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 F2FAB16A4CE
	for <perforce@freebsd.org>; Fri, 31 Dec 2004 15:09:27 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C34D543D45
	for <perforce@freebsd.org>; Fri, 31 Dec 2004 15:09:27 +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 iBVF9Re4009754
	for <perforce@freebsd.org>; Fri, 31 Dec 2004 15:09:27 GMT
	(envelope-from davidxu@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBVF9RZN009751
	for perforce@freebsd.org; Fri, 31 Dec 2004 15:09:27 GMT
	(envelope-from davidxu@freebsd.org)
Date: Fri, 31 Dec 2004 15:09:27 GMT
Message-Id: <200412311509.iBVF9RZN009751@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 67994 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: Fri, 31 Dec 2004 15:09:29 -0000

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

Change 67994 by davidxu@davidxu_tiger on 2004/12/31 15:09:21

	cancellation save/restore protocol is changed, followup.

Affected files ...

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

Differences ...

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

@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libpthread/thread/thr_sem.c,v 1.15 2004/02/06 15:20:56 deischen Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_sem.c,v 1.16 2004/12/18 18:07:37 deischen Exp $
  */
 
 #include "namespace.h"
@@ -140,16 +140,17 @@
 _sem_wait(sem_t *sem)
 {
 	struct pthread *curthread;
+	int oldcancel;
 	int retval;
 
 	if (sem_check_validity(sem) != 0)
 		return (-1);
 
+	curthread = _get_curthread();
 	if ((*sem)->syssem != 0) {
-		curthread = _get_curthread();
-		_thr_cancel_enter(curthread);
+		oldcancel = _thr_cancel_enter(curthread);
 		retval = ksem_wait((*sem)->semid);
-		_thr_cancel_leave(curthread, retval != 0);
+		_thr_cancel_leave(curthread, oldcancel);
 	}
 	else {
 		pthread_testcancel();
@@ -157,9 +158,9 @@
 
 		while ((*sem)->count <= 0) {
 			(*sem)->nwaiters++;
-			pthread_cleanup_push(decrease_nwaiters, sem);
+			THR_CLEANUP_PUSH(curthread, decrease_nwaiters, sem);
 			pthread_cond_wait(&(*sem)->gtzero, &(*sem)->lock);
-			pthread_cleanup_pop(0);
+			THR_CLEANUP_POP(curthread, 0);
 			(*sem)->nwaiters--;
 		}
 		(*sem)->count--;
@@ -177,6 +178,7 @@
 {
 	struct pthread *curthread;
 	int retval;
+	int oldcancel;
 	int timeout_invalid;
 
 	if (sem_check_validity(sem) != 0)
@@ -184,9 +186,9 @@
 
 	if ((*sem)->syssem != 0) {
 		curthread = _get_curthread();
-		_thr_cancel_enter(curthread);
+		oldcancel = _thr_cancel_enter(curthread);
 		retval = ksem_timedwait((*sem)->semid, abs_timeout);
-		_thr_cancel_leave(curthread, retval != 0);
+		_thr_cancel_leave(curthread, oldcancel);
 	}
 	else {
 		/*