2006-12-04 Joel Sherrill <joel.sherrill@oarcorp.com>

	* posix/src/prwlockunlock.c, rtems/Makefile.am,
	rtems/src/barrierrelease.c, rtems/src/barrierwait.c,
	score/src/corerwlockobtainread.c, score/src/corerwlockrelease.c:
	Complete implementation of barrier as the rest of the test code is
	now implemented. Also add blocking code to rwlock.

7 files changed, 48 insertions, 10 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index cfdd74dd45..aa47a2e91f 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-04	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* posix/src/prwlockunlock.c, rtems/Makefile.am,
+	rtems/src/barrierrelease.c, rtems/src/barrierwait.c,
+	score/src/corerwlockobtainread.c, score/src/corerwlockrelease.c:
+	Complete implementation of barrier as the rest of the test code is
+	now implemented. Also add blocking code to rwlock.
+
 2006-12-02	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* configure.ac: New BUG-REPORT address.
diff --git a/cpukit/posix/src/prwlockunlock.c b/cpukit/posix/src/prwlockunlock.c
index 99f971ab17..a91a0b1291 100644
--- a/cpukit/posix/src/prwlockunlock.c
+++ b/cpukit/posix/src/prwlockunlock.c
@@ -40,6 +40,7 @@ int pthread_rwlock_unlock(
 {
   POSIX_RWLock_Control  *the_rwlock;
   Objects_Locations      location;
+  CORE_RWLock_Status     status;
   
   if ( !rwlock )
     return EINVAL;
@@ -52,11 +53,9 @@ int pthread_rwlock_unlock(
       return EINVAL;
 
     case OBJECTS_LOCAL:
-
-      /* XXX */
-
+      status = _CORE_RWLock_Release( &the_rwlock->RWLock );
       _Thread_Enable_dispatch();
-      return 0;
+      return _POSIX_RWLock_Translate_core_RWLock_return_code( status );
   }
 
   return POSIX_BOTTOM_REACHED();
diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am
index b59b132896..1eb5bbc811 100644
--- a/cpukit/rtems/Makefile.am
+++ b/cpukit/rtems/Makefile.am
@@ -72,7 +72,8 @@ librtems_a_SOURCES += src/intr.c src/intrbody.c src/intrcatch.c
 
 ## BARRIER_C_FILES
 librtems_a_SOURCES += src/barrier.c src/barriercreate.c src/barrierdelete.c \
-   src/barrierident.c src/barriertranslatereturncode.c src/barrierwait.c
+   src/barrierident.c src/barriertranslatereturncode.c src/barrierrelease.c \
+   src/barrierwait.c
 
 ## CLOCK_C_FILES
 librtems_a_SOURCES += src/rtclock.c src/clockget.c src/clockset.c \
diff --git a/cpukit/rtems/src/barrierrelease.c b/cpukit/rtems/src/barrierrelease.c
index 0d7f7622ef..25f6a5fc01 100644
--- a/cpukit/rtems/src/barrierrelease.c
+++ b/cpukit/rtems/src/barrierrelease.c
@@ -57,8 +57,7 @@ rtems_status_code rtems_barrier_release(
     case OBJECTS_LOCAL:
       *released = _CORE_barrier_Release( &the_barrier->Barrier, id, NULL );
       _Thread_Enable_dispatch();
-      return _Barrier_Translate_core_barrier_return_code(
-                _Thread_Executing->Wait.return_code );
+      return RTEMS_SUCCESSFUL;
 
   }
 
diff --git a/cpukit/rtems/src/barrierwait.c b/cpukit/rtems/src/barrierwait.c
index 754e1ba969..5f282552ae 100644
--- a/cpukit/rtems/src/barrierwait.c
+++ b/cpukit/rtems/src/barrierwait.c
@@ -58,6 +58,7 @@ rtems_status_code rtems_barrier_wait(
         timeout,
         NULL
       );
+      _Thread_Enable_dispatch();
       return _Barrier_Translate_core_barrier_return_code(
                 _Thread_Executing->Wait.return_code );
 
diff --git a/cpukit/score/src/corerwlockobtainread.c b/cpukit/score/src/corerwlockobtainread.c
index 46f77043e8..724529eef5 100644
--- a/cpukit/score/src/corerwlockobtainread.c
+++ b/cpukit/score/src/corerwlockobtainread.c
@@ -93,7 +93,7 @@ void _CORE_RWLock_Obtain_for_reading(
     _Thread_queue_Enter_critical_section( &the_rwlock->Wait_queue );
     executing->Wait.queue       = &the_rwlock->Wait_queue;
     executing->Wait.id          = id;
-    executing->Wait.option      = CORE_RWLOCK_THREAD_WAITING_FOR_WRITE;
+    executing->Wait.option      = CORE_RWLOCK_THREAD_WAITING_FOR_READ;
     executing->Wait.return_code = CORE_RWLOCK_SUCCESSFUL;
     _ISR_Enable( level );
 
diff --git a/cpukit/score/src/corerwlockrelease.c b/cpukit/score/src/corerwlockrelease.c
index 5943785664..30daaeaba9 100644
--- a/cpukit/score/src/corerwlockrelease.c
+++ b/cpukit/score/src/corerwlockrelease.c
@@ -39,6 +39,8 @@ CORE_RWLock_Status _CORE_RWLock_Release(
 {
   ISR_Level       level;
   Thread_Control *executing = _Thread_Executing;
+  Thread_Control *next;
+  uint32_t        rwmode;
 
   /*
    *  If unlocked, then OK to read.
@@ -64,6 +66,7 @@ CORE_RWLock_Status _CORE_RWLock_Release(
 	executing->Wait.return_code = CORE_RWLOCK_SUCCESSFUL;
         break;
       case CORE_RWLOCK_LOCKED_FOR_WRITING:
+	executing->Wait.return_code = CORE_RWLOCK_SUCCESSFUL;
         break;
     }
 
@@ -71,10 +74,37 @@ CORE_RWLock_Status _CORE_RWLock_Release(
      * Implicitly transition to "unlocked" and find another thread interested
      * in obtaining this rwlock.
      */
+    the_rwlock->current_state = CORE_RWLOCK_UNLOCKED;
+    _ISR_Enable( level );
+
+    next = _Thread_queue_Dequeue( &the_rwlock->Wait_queue );
+    
+    rwmode = next->Wait.option;
+    if ( rwmode == CORE_RWLOCK_THREAD_WAITING_FOR_WRITE ) {
+      the_rwlock->current_state = CORE_RWLOCK_LOCKED_FOR_WRITING;
+      return CORE_RWLOCK_SUCCESSFUL;
+    } 
+
+    /*
+     * Must be CORE_RWLOCK_THREAD_WAITING_FOR_READING now see if more
+     * readers can be let go.
+     */
+
+    while ( 1 ) {
+      next = _Thread_queue_First( &the_rwlock->Wait_queue );
+      if ( !next ) 
+        return CORE_RWLOCK_SUCCESSFUL;
+      if ( next->Wait.option != CORE_RWLOCK_THREAD_WAITING_FOR_READ )
+        return CORE_RWLOCK_SUCCESSFUL;
+
+      /* it is definitely wanting to read */
+      the_rwlock->number_of_readers += 1;
+      _Thread_queue_Extract( &the_rwlock->Wait_queue, next );
+    }
+
+
 
     /* XXX need to put read/write lock request indicator in Wait info */
 
-    /* XXX find one writer or multiple readers to take off */
-  _ISR_Enable( level );
   return CORE_RWLOCK_SUCCESSFUL;
 }