From f6a97f59925e0f6f880fdc5ce9e94a84e5db2998 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Tue, 16 Feb 2021 08:15:10 +0100
Subject: rtems: Simplify signal handling

Remove superfluous ASR_Information::signals_posted.  Move code out of
trivial inline functions.

Update #4244.
---
 cpukit/rtems/src/signalcatch.c | 18 ++++++++++++------
 cpukit/rtems/src/signalsend.c  | 23 ++++++++++-------------
 cpukit/rtems/src/taskmode.c    | 24 +++++++++++-------------
 3 files changed, 33 insertions(+), 32 deletions(-)

(limited to 'cpukit/rtems')

diff --git a/cpukit/rtems/src/signalcatch.c b/cpukit/rtems/src/signalcatch.c
index e4ff15fd40..8ee22e5ec1 100644
--- a/cpukit/rtems/src/signalcatch.c
+++ b/cpukit/rtems/src/signalcatch.c
@@ -22,7 +22,6 @@
 #endif
 
 #include <rtems/rtems/signalimpl.h>
-#include <rtems/rtems/asrimpl.h>
 #include <rtems/rtems/tasksdata.h>
 #include <rtems/score/threadimpl.h>
 
@@ -41,12 +40,19 @@ rtems_status_code rtems_signal_catch(
   executing = _Thread_State_acquire_for_executing( &lock_context );
   api = executing->API_Extensions[ THREAD_API_RTEMS ];
   asr = &api->Signal;
+  asr->handler = asr_handler;
+  asr->mode_set = mode_set;
 
-  if ( asr_handler != NULL ) {
-    asr->mode_set = mode_set;
-    asr->handler = asr_handler;
-  } else {
-    _ASR_Initialize( asr );
+  if ( asr_handler == NULL ) {
+    Chain_Node *node;
+
+    asr->signals_pending = 0;
+    node = &api->Signal_action.Node;
+
+    if ( !_Chain_Is_node_off_chain( node ) ) {
+      _Chain_Extract_unprotected( node );
+      _Chain_Set_off_chain( node );
+    }
   }
 
   _Thread_State_release( executing, &lock_context );
diff --git a/cpukit/rtems/src/signalsend.c b/cpukit/rtems/src/signalsend.c
index fc8a66b6c6..606ddfcb53 100644
--- a/cpukit/rtems/src/signalsend.c
+++ b/cpukit/rtems/src/signalsend.c
@@ -21,14 +21,13 @@
 #endif
 
 #include <rtems/rtems/signalimpl.h>
-#include <rtems/rtems/asrimpl.h>
 #include <rtems/rtems/tasksdata.h>
 #include <rtems/score/threaddispatch.h>
 #include <rtems/score/threadimpl.h>
 
 #include <rtems/sysinit.h>
 
-void _Signal_Action_handler(
+static void _Signal_Action_handler(
   Thread_Control   *executing,
   Thread_Action    *action,
   ISR_lock_Context *lock_context
@@ -41,23 +40,20 @@ void _Signal_Action_handler(
 
   (void) action;
 
-  /*
-   *  Signal Processing
-   */
-
   api = executing->API_Extensions[ THREAD_API_RTEMS ];
   asr = &api->Signal;
-  signal_set = _ASR_Get_posted_signals( asr );
 
-  if ( signal_set == 0 ) {
-    return;
-  }
+  /* Get and clear the pending signals */
+  signal_set = asr->signals_pending;
+  _Assert( signal_set != 0 );
+  asr->signals_pending = 0;
 
   _Thread_State_release( executing, lock_context );
 
   rtems_task_mode( asr->mode_set, RTEMS_ALL_MODE_MASKS, &prev_mode );
 
-  (*asr->handler)( signal_set );
+  /* Call the ASR handler in the ASR processing mode */
+  ( *asr->handler )( signal_set );
 
   rtems_task_mode( prev_mode, RTEMS_ALL_MODE_MASKS, &prev_mode );
 
@@ -98,10 +94,12 @@ rtems_status_code rtems_signal_send(
     return RTEMS_NOT_DEFINED;
   }
 
+  /* Make the signals of the set pending */
+  asr->signals_pending |= signal_set;
+
   if ( asr->is_enabled ) {
     Per_CPU_Control *cpu_self;
 
-    _ASR_Post_signals( signal_set, &asr->signals_posted );
     _Thread_Add_post_switch_action(
       the_thread,
       &api->Signal_action,
@@ -111,7 +109,6 @@ rtems_status_code rtems_signal_send(
     _Thread_State_release( the_thread, &lock_context );
     _Thread_Dispatch_enable( cpu_self );
   } else {
-    _ASR_Post_signals( signal_set, &asr->signals_pending );
     _Thread_State_release( the_thread, &lock_context );
   }
 
diff --git a/cpukit/rtems/src/taskmode.c b/cpukit/rtems/src/taskmode.c
index cbf8c06a6b..24905368c3 100644
--- a/cpukit/rtems/src/taskmode.c
+++ b/cpukit/rtems/src/taskmode.c
@@ -21,7 +21,6 @@
 #endif
 
 #include <rtems/rtems/tasksdata.h>
-#include <rtems/rtems/asrimpl.h>
 #include <rtems/rtems/modesimpl.h>
 #include <rtems/rtems/signalimpl.h>
 #include <rtems/score/schedulerimpl.h>
@@ -125,21 +124,20 @@ rtems_status_code rtems_task_mode(
    */
   needs_asr_dispatching = false;
   if ( mask & RTEMS_ASR_MASK ) {
-    bool is_asr_enabled = !_Modes_Is_asr_disabled( mode_set );
+    bool prev_asr_is_enabled;
 
     _Thread_State_acquire( executing, &lock_context );
 
-    if ( is_asr_enabled != asr->is_enabled ) {
-      asr->is_enabled = is_asr_enabled;
-
-      if ( _ASR_Swap_signals( asr ) != 0 ) {
-        needs_asr_dispatching = true;
-        _Thread_Add_post_switch_action(
-          executing,
-          &api->Signal_action,
-          _Signal_Action_handler
-        );
-      }
+    prev_asr_is_enabled = asr->is_enabled;
+    asr->is_enabled = !_Modes_Is_asr_disabled( mode_set );
+
+    if (
+      !prev_asr_is_enabled &&
+        asr->is_enabled &&
+        asr->signals_pending != 0
+    ) {
+      needs_asr_dispatching = true;
+      _Thread_Append_post_switch_action( executing, &api->Signal_action );
     }
 
     _Thread_State_release( executing, &lock_context );
-- 
cgit v1.2.3