score: Add Thread_queue_Control::Lock

Move the complete thread queue enqueue procedure into
_Thread_queue_Enqueue_critical().  It is possible to use the thread
queue lock to protect state of the object embedding the thread queue.
This enables per object fine grained locking in the future.

Delete _Thread_queue_Enter_critical_section().

Update #2273.

1 files changed, 7 insertions, 9 deletions

diff --git a/cpukit/score/src/corebarrierwait.c b/cpukit/score/src/corebarrierwait.c
index 6267ae67c0..30abf0c17a 100644
--- a/cpukit/score/src/corebarrierwait.c
+++ b/cpukit/score/src/corebarrierwait.c
@@ -32,30 +32,28 @@ void _CORE_barrier_Wait(
   CORE_barrier_API_mp_support_callout  api_barrier_mp_support
 )
 {
-  ISR_Level       level;
+  ISR_lock_Context lock_context;
 
   executing->Wait.return_code = CORE_BARRIER_STATUS_SUCCESSFUL;
-  _ISR_Disable( level );
+  _Thread_queue_Acquire( &the_barrier->Wait_queue, &lock_context );
   the_barrier->number_of_waiting_threads++;
   if ( _CORE_barrier_Is_automatic( &the_barrier->Attributes ) ) {
     if ( the_barrier->number_of_waiting_threads ==
 	 the_barrier->Attributes.maximum_count) {
       executing->Wait.return_code = CORE_BARRIER_STATUS_AUTOMATICALLY_RELEASED;
-      _ISR_Enable( level );
+      _Thread_queue_Release( &the_barrier->Wait_queue, &lock_context );
       _CORE_barrier_Release( the_barrier, id, api_barrier_mp_support );
       return;
     }
   }
 
-  _Thread_queue_Enter_critical_section( &the_barrier->Wait_queue );
-  executing->Wait.queue          = &the_barrier->Wait_queue;
-  executing->Wait.id             = id;
-  _ISR_Enable( level );
+  executing->Wait.id = id;
 
-  _Thread_queue_Enqueue(
+  _Thread_queue_Enqueue_critical(
     &the_barrier->Wait_queue,
     executing,
     STATES_WAITING_FOR_BARRIER,
-    timeout
+    timeout,
+    &lock_context
   );
 }