PERFORCE change 67679 for review

[David Xu]

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

Change 67679 by davidxu at 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;