From owner-p4-projects@FreeBSD.ORG  Sat Dec 25 14:15:44 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7348716A4D0; Sat, 25 Dec 2004 14:15:44 +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 447AB16A4CE
	for <perforce@freebsd.org>; Sat, 25 Dec 2004 14:15:44 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2B75843D1F
	for <perforce@freebsd.org>; Sat, 25 Dec 2004 14:15:44 +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 iBPEFhZk039517
	for <perforce@freebsd.org>; Sat, 25 Dec 2004 14:15:44 GMT
	(envelope-from davidxu@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBPEFhfs039514
	for perforce@freebsd.org; Sat, 25 Dec 2004 14:15:43 GMT
	(envelope-from davidxu@freebsd.org)
Date: Sat, 25 Dec 2004 14:15:43 GMT
Message-Id: <200412251415.iBPEFhfs039514@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 67679 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: Sat, 25 Dec 2004 14:15:45 -0000

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

Change 67679 by davidxu@davidxu_alona on 2004/12/25 14:15:10

	Remove COND_WAIT state, no longer need it.

Affected files ...

.. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_cancel.c#3 edit
.. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_info.c#3 edit
.. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_kern.c#6 edit
.. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#8 edit
.. //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_sig.c#3 edit

Differences ...

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

@@ -95,7 +95,6 @@
 
 			case PS_SUSPENDED:
 			case PS_MUTEX_WAIT:
-			case PS_COND_WAIT:
 				/*
 				 * Threads in these states may be in queues.
 				 * In order to preserve queue integrity, the

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

@@ -57,7 +57,6 @@
 static const struct s_thread_info thread_info[] = {
 	{PS_RUNNING	, "Running"},
 	{PS_MUTEX_WAIT	, "Waiting on a mutex"},
-	{PS_COND_WAIT	, "Waiting on a condition variable"},
 	{PS_JOIN	, "Waiting to join"},
 	{PS_SUSPENDED	, "Suspended"},
 	{PS_DEAD	, "Dead"},

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

@@ -217,7 +217,6 @@
 	 */
 	switch (curthread->state) {
 	case PS_MUTEX_WAIT:
-	case PS_COND_WAIT:
 		if (THR_NEED_CANCEL(curthread)) {
 			curthread->interrupted = 1;
 			curthread->continuation = _thr_finish_cancellation;

==== //depot/projects/davidxu_thread/src/lib/libthread/thread/thr_private.h#8 (text+ko) ====

@@ -309,7 +309,6 @@
 enum pthread_state {
 	PS_RUNNING,
 	PS_MUTEX_WAIT,
-	PS_COND_WAIT,
 	PS_JOIN,
 	PS_SUSPENDED,
 	PS_DEAD,

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

@@ -288,7 +288,6 @@
 		 * States which cannot be interrupted but still require the
 		 * signal handler to run:
 		 */
-		case PS_COND_WAIT:
 		case PS_MUTEX_WAIT:
 			break;