score: Add _Thread_Get_interrupt_disable()

Remove _Thread_Acquire() and _Thread_Acquire_for_executing().  Add
utility functions for the default thread lock.   Use the default thread
lock for the RTEMS events.  There is no need to disable thread
dispatching and a Giant acquire in _Event_Timeout() since this was
already done by the caller.

Update #2273.

7 files changed, 57 insertions, 74 deletions

diff --git a/cpukit/rtems/src/eventreceive.c b/cpukit/rtems/src/eventreceive.c
index 07e1c574df..14f93db4e6 100644
--- a/cpukit/rtems/src/eventreceive.c
+++ b/cpukit/rtems/src/eventreceive.c
@@ -34,9 +34,13 @@ rtems_status_code rtems_event_receive(
 
   if ( event_out != NULL ) {
     ISR_lock_Context   lock_context;
-    Thread_Control    *executing = _Thread_Acquire_executing( &lock_context );
-    RTEMS_API_Control *api = executing->API_Extensions[ THREAD_API_RTEMS ];
-    Event_Control     *event = &api->Event;
+    Thread_Control    *executing;
+    RTEMS_API_Control *api;
+    Event_Control     *event;
+
+    executing = _Thread_Lock_acquire_default_for_executing( &lock_context );
+    api = executing->API_Extensions[ THREAD_API_RTEMS ];
+    event = &api->Event;
 
     if ( !_Event_sets_Is_empty( event_in ) ) {
       _Event_Seize(
@@ -54,7 +58,7 @@ rtems_status_code rtems_event_receive(
       sc = executing->Wait.return_code;
     } else {
       *event_out = event->pending_events;
-      _Objects_Release_and_ISR_enable( &executing->Object, &lock_context );
+      _Thread_Lock_release_default( executing, &lock_context );
       sc = RTEMS_SUCCESSFUL;
     }
   } else {
diff --git a/cpukit/rtems/src/eventseize.c b/cpukit/rtems/src/eventseize.c
index 59a2b6256f..929665641c 100644
--- a/cpukit/rtems/src/eventseize.c
+++ b/cpukit/rtems/src/eventseize.c
@@ -57,13 +57,13 @@ void _Event_Seize(
        (seized_events == event_in || _Options_Is_any( option_set )) ) {
     event->pending_events =
       _Event_sets_Clear( pending_events, seized_events );
-    _Objects_Release_and_ISR_enable( &executing->Object, lock_context );
+    _Thread_Lock_release_default( executing, lock_context );
     *event_out = seized_events;
     return;
   }
 
   if ( _Options_Is_no_wait( option_set ) ) {
-    _Objects_Release_and_ISR_enable( &executing->Object, lock_context );
+    _Thread_Lock_release_default( executing, lock_context );
     executing->Wait.return_code = RTEMS_UNSATISFIED;
     *event_out = seized_events;
     return;
@@ -84,19 +84,12 @@ void _Event_Seize(
   executing->Wait.return_argument = event_out;
   _Thread_Wait_flags_set( executing, intend_to_block );
 
-  cpu_self = _Objects_Release_and_thread_dispatch_disable(
-    &executing->Object,
-    lock_context
-  );
+  cpu_self = _Thread_Dispatch_disable_critical();
+  _Thread_Lock_release_default( executing, lock_context );
   _Giant_Acquire( cpu_self );
 
   if ( ticks ) {
-    _Watchdog_Initialize(
-      &executing->Timer,
-      _Event_Timeout,
-      executing->Object.id,
-      NULL
-    );
+    _Watchdog_Initialize( &executing->Timer, _Event_Timeout, 0, executing );
     _Watchdog_Insert_ticks( &executing->Timer, ticks );
   }
 
diff --git a/cpukit/rtems/src/eventsend.c b/cpukit/rtems/src/eventsend.c
index bb9ca3344d..c9e81fb95f 100644
--- a/cpukit/rtems/src/eventsend.c
+++ b/cpukit/rtems/src/eventsend.c
@@ -33,7 +33,7 @@ rtems_status_code rtems_event_send(
   RTEMS_API_Control *api;
   ISR_lock_Context   lock_context;
 
-  thread = _Thread_Acquire( id, &location, &lock_context );
+  thread = _Thread_Get_interrupt_disable( id, &location, &lock_context );
   switch ( location ) {
     case OBJECTS_LOCAL:
       api = thread->API_Extensions[ THREAD_API_RTEMS ];
@@ -44,6 +44,7 @@ rtems_status_code rtems_event_send(
         THREAD_WAIT_CLASS_EVENT,
         &lock_context
       );
+      _Objects_Put_for_get_isr_disable( &thread->Object );
       sc = RTEMS_SUCCESSFUL;
       break;
 #ifdef RTEMS_MULTIPROCESSING
diff --git a/cpukit/rtems/src/eventsurrender.c b/cpukit/rtems/src/eventsurrender.c
index 824912b38d..ba4e429f1e 100644
--- a/cpukit/rtems/src/eventsurrender.c
+++ b/cpukit/rtems/src/eventsurrender.c
@@ -64,6 +64,8 @@ void _Event_Surrender(
   Thread_Wait_flags wait_flags;
   bool              unblock;
 
+  _Thread_Lock_acquire_default_critical( the_thread, lock_context );
+
   _Event_sets_Post( event_in, &event->pending_events );
   pending_events = event->pending_events;
 
@@ -105,10 +107,8 @@ void _Event_Surrender(
   if ( unblock ) {
     Per_CPU_Control *cpu_self;
 
-    cpu_self = _Objects_Release_and_thread_dispatch_disable(
-      &the_thread->Object,
-      lock_context
-    );
+    cpu_self = _Thread_Dispatch_disable_critical();
+    _Thread_Lock_release_default( the_thread, lock_context );
     _Giant_Acquire( cpu_self );
 
     _Watchdog_Remove( &the_thread->Timer );
@@ -117,6 +117,6 @@ void _Event_Surrender(
     _Giant_Release( cpu_self );
     _Thread_Dispatch_enable( cpu_self );
   } else {
-    _Objects_Release_and_ISR_enable( &the_thread->Object, lock_context );
+    _Thread_Lock_release_default( the_thread, lock_context );
   }
 }
diff --git a/cpukit/rtems/src/eventtimeout.c b/cpukit/rtems/src/eventtimeout.c
index 295f0c5b5f..9c091748c0 100644
--- a/cpukit/rtems/src/eventtimeout.c
+++ b/cpukit/rtems/src/eventtimeout.c
@@ -27,7 +27,6 @@ void _Event_Timeout(
 )
 {
   Thread_Control    *the_thread;
-  Objects_Locations  location;
   ISR_lock_Context   lock_context;
   Thread_Wait_flags  wait_flags;
   Thread_Wait_flags  wait_class;
@@ -36,55 +35,36 @@ void _Event_Timeout(
   bool               success;
   bool               unblock;
 
-  the_thread = _Thread_Acquire( id, &location, &lock_context );
-  switch ( location ) {
-    case OBJECTS_LOCAL:
-      wait_flags = _Thread_Wait_flags_get( the_thread );
-      wait_class = wait_flags & THREAD_WAIT_CLASS_MASK;
-      intend_to_block = wait_class | THREAD_WAIT_STATE_INTEND_TO_BLOCK;
-      blocked = wait_class | THREAD_WAIT_STATE_BLOCKED;
-      success = _Thread_Wait_flags_try_change_critical(
-        the_thread,
-        intend_to_block,
-        wait_class | THREAD_WAIT_STATE_INTERRUPT_TIMEOUT
-      );
+  the_thread = arg;
+  _Thread_Lock_acquire_default( the_thread, &lock_context );
 
-      if ( success ) {
-        the_thread->Wait.return_code = RTEMS_TIMEOUT;
-        unblock = false;
-      } else if ( _Thread_Wait_flags_get( the_thread ) == blocked ) {
-        the_thread->Wait.return_code = RTEMS_TIMEOUT;
-        _Thread_Wait_flags_set(
-          the_thread,
-          wait_class | THREAD_WAIT_STATE_TIMEOUT
-        );
-        unblock = true;
-      } else {
-        unblock = false;
-      }
+  wait_flags = _Thread_Wait_flags_get( the_thread );
+  wait_class = wait_flags & THREAD_WAIT_CLASS_MASK;
+  intend_to_block = wait_class | THREAD_WAIT_STATE_INTEND_TO_BLOCK;
+  blocked = wait_class | THREAD_WAIT_STATE_BLOCKED;
+  success = _Thread_Wait_flags_try_change_critical(
+    the_thread,
+    intend_to_block,
+    wait_class | THREAD_WAIT_STATE_INTERRUPT_TIMEOUT
+  );
 
-      if ( unblock ) {
-        Per_CPU_Control *cpu_self;
-
-        cpu_self = _Objects_Release_and_thread_dispatch_disable(
-          &the_thread->Object,
-          &lock_context
-        );
-        _Giant_Acquire( cpu_self );
-
-        _Thread_Unblock( the_thread );
+  if ( success ) {
+    the_thread->Wait.return_code = RTEMS_TIMEOUT;
+    unblock = false;
+  } else if ( _Thread_Wait_flags_get( the_thread ) == blocked ) {
+    the_thread->Wait.return_code = RTEMS_TIMEOUT;
+    _Thread_Wait_flags_set(
+      the_thread,
+      wait_class | THREAD_WAIT_STATE_TIMEOUT
+    );
+    unblock = true;
+  } else {
+    unblock = false;
+  }
 
-        _Giant_Release( cpu_self );
-        _Thread_Dispatch_enable( cpu_self );
-      } else {
-        _Objects_Release_and_ISR_enable( &the_thread->Object, &lock_context );
-      }
+  _Thread_Lock_release_default( the_thread, &lock_context );
 
-      break;
-#if defined(RTEMS_MULTIPROCESSING)
-    case OBJECTS_REMOTE:  /* impossible */
-#endif
-    case OBJECTS_ERROR:
-      break;
+  if ( unblock ) {
+    _Thread_Unblock( the_thread );
   }
 }
diff --git a/cpukit/rtems/src/systemeventreceive.c b/cpukit/rtems/src/systemeventreceive.c
index 394b26e0a8..c33f468790 100644
--- a/cpukit/rtems/src/systemeventreceive.c
+++ b/cpukit/rtems/src/systemeventreceive.c
@@ -40,9 +40,13 @@ rtems_status_code rtems_event_system_receive(
 
   if ( event_out != NULL ) {
     ISR_lock_Context   lock_context;
-    Thread_Control    *executing = _Thread_Acquire_executing( &lock_context );
-    RTEMS_API_Control *api = executing->API_Extensions[ THREAD_API_RTEMS ];
-    Event_Control     *event = &api->System_event;
+    Thread_Control    *executing;
+    RTEMS_API_Control *api;
+    Event_Control     *event;
+
+    executing = _Thread_Lock_acquire_default_for_executing( &lock_context );
+    api = executing->API_Extensions[ THREAD_API_RTEMS ];
+    event = &api->System_event;
 
     if ( !_Event_sets_Is_empty( event_in ) ) {
       _Event_Seize(
@@ -60,7 +64,7 @@ rtems_status_code rtems_event_system_receive(
       sc = executing->Wait.return_code;
     } else {
       *event_out = event->pending_events;
-      _Objects_Release_and_ISR_enable( &executing->Object, &lock_context );
+      _Thread_Lock_release_default( executing, &lock_context );
       sc = RTEMS_SUCCESSFUL;
     }
   } else {
diff --git a/cpukit/rtems/src/systemeventsend.c b/cpukit/rtems/src/systemeventsend.c
index d35127d4bf..1892c13fe7 100644
--- a/cpukit/rtems/src/systemeventsend.c
+++ b/cpukit/rtems/src/systemeventsend.c
@@ -39,7 +39,7 @@ rtems_status_code rtems_event_system_send(
   RTEMS_API_Control *api;
   ISR_lock_Context   lock_context;
 
-  thread = _Thread_Acquire( id, &location, &lock_context );
+  thread = _Thread_Get_interrupt_disable( id, &location, &lock_context );
   switch ( location ) {
     case OBJECTS_LOCAL:
       api = thread->API_Extensions[ THREAD_API_RTEMS ];
@@ -50,6 +50,7 @@ rtems_status_code rtems_event_system_send(
         THREAD_WAIT_CLASS_SYSTEM_EVENT,
         &lock_context
       );
+      _Objects_Put_for_get_isr_disable( &thread->Object );
       sc = RTEMS_SUCCESSFUL;
       break;
 #ifdef RTEMS_MULTIPROCESSING