2008-01-22 Joel Sherrill <joel.sherrill@oarcorp.com>

	* rtems/include/rtems/rtems/event.h,
	rtems/inline/rtems/rtems/eventset.inl, rtems/src/event.c,
	rtems/src/eventseize.c, rtems/src/eventsurrender.c,
	rtems/src/eventtimeout.c, score/Makefile.am, score/preinstall.am,
	score/include/rtems/score/interr.h,
	score/include/rtems/score/thread.h,
	score/include/rtems/score/threadq.h,
	score/include/rtems/score/tqdata.h,
	score/inline/rtems/score/threadq.inl,
	score/inline/rtems/score/tqdata.inl, score/src/threadq.c,
	score/src/threadqdequeue.c, score/src/threadqdequeuefifo.c,
	score/src/threadqdequeuepriority.c, score/src/threadqenqueue.c,
	score/src/threadqenqueuefifo.c, score/src/threadqenqueuepriority.c,
	score/src/threadqextract.c, score/src/threadqextractfifo.c,
	score/src/threadqextractpriority.c,
	score/src/threadqextractwithproxy.c, score/src/threadqfirst.c,
	score/src/threadqfirstfifo.c, score/src/threadqfirstpriority.c,
	score/src/threadqflush.c, score/src/threadqrequeue.c,
	score/src/threadqtimeout.c: Refactor thread queue enqueue and event
	blocking synchronization critical sections. This resulted in three
	copies of essentially the same hard to test critical section code
	becoming the one shared routine _Thread_blocking_operation_Cancel. In
	addition, the thread queue and event code now share a common
	synchronization enumerated type. Along the way, switches were
	reworked to eliminate dead code generated by gcc and comments and
	copyrights were updated.
	* score/include/rtems/score/threadsync.h,
	score/src/threadblockingoperationcancel.c: New files.

1 files changed, 20 insertions, 19 deletions

diff --git a/cpukit/score/src/threadqrequeue.c b/cpukit/score/src/threadqrequeue.c
index a536eecdcf..4c50565b86 100644
--- a/cpukit/score/src/threadqrequeue.c
+++ b/cpukit/score/src/threadqrequeue.c
@@ -2,7 +2,7 @@
  *  Thread Queue Handler
  *
  *
- *  COPYRIGHT (c) 1989-2006.
+ *  COPYRIGHT (c) 1989-2008.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -46,28 +46,29 @@ void _Thread_queue_Requeue(
   Thread_Control       *the_thread
 )
 {
-  /* just in case the thread really wasn't blocked here */
-  if ( !the_thread_queue ) {
+  /*
+   * Just in case the thread really wasn't blocked on a thread queue
+   * when we get here.
+   */
+  if ( !the_thread_queue )
     return;
-  }
 
-  switch ( the_thread_queue->discipline ) {
-    case THREAD_QUEUE_DISCIPLINE_FIFO:
-      /* queueing by FIFO -- nothing to do */
-      break;
-    case THREAD_QUEUE_DISCIPLINE_PRIORITY: {
-      Thread_queue_Control *tq = the_thread_queue;
-      ISR_Level             level;
+  /*
+   * If queueing by FIFO, there is nothing to do. This only applies to
+   * priority blocking discipline.
+   */
+  if ( the_thread_queue->discipline == THREAD_QUEUE_DISCIPLINE_PRIORITY ) {
+    Thread_queue_Control *tq = the_thread_queue;
+    ISR_Level             level;
+    ISR_Level             level_ignored;
 
-      _ISR_Disable( level );
-      if ( _States_Is_waiting_on_thread_queue( the_thread->current_state ) ) {
-        _Thread_queue_Enter_critical_section( tq );
-        _Thread_queue_Extract_priority_helper( tq, the_thread, TRUE );
-        _Thread_queue_Enqueue_priority( tq, the_thread );
-      }
-      _ISR_Enable( level );
-      break;
+    _ISR_Disable( level );
+    if ( _States_Is_waiting_on_thread_queue( the_thread->current_state ) ) {
+      _Thread_queue_Enter_critical_section( tq );
+      _Thread_queue_Extract_priority_helper( tq, the_thread, TRUE );
+      (void) _Thread_queue_Enqueue_priority( tq, the_thread, &level_ignored );
     }
+    _ISR_Enable( level );
   }
 }