Changeset 5468464 in rtems

Timestamp:

Nov 11, 2021, 7:44:29 AM (2 months ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

master

Children:

675e879

Parents:

3b6e263a

git-author:

Sebastian Huber <sebastian.huber@…> (11/11/21 07:44:29)

git-committer:

Sebastian Huber <sebastian.huber@…> (11/23/21 10:00:28)

Message:

score: Properly continue the thread during restart

The _Thread_queue_Extract() does not deal with potential priority
updates and the SMP locking protocol handling. Use
_Thread_queue_Continue(). For the POSIX signals processing this is
currently probably unnecessary, however, the use case is similar to the
restart so use the same appoach.

Close #4546.

Location:

cpukit

Files:

• include/rtems/score/status.h (modified) (1 diff)
• include/rtems/score/threadimpl.h (modified) (2 diffs)
• posix/src/psignalunblockthread.c (modified) (3 diffs)
• score/src/threadrestart.c (modified) (3 diffs)

cpukit/include/rtems/score/status.h

@@ -107 +107 @@
   STATUS_INTERRUPTED =
     STATUS_BUILD( STATUS_CLASSIC_INTERNAL_ERROR, EINTR ),
+  STATUS_INTERNAL_ERROR =
+    STATUS_BUILD( STATUS_CLASSIC_INTERNAL_ERROR, ENOTSUP ),
   STATUS_INVALID_ADDRESS =
     STATUS_BUILD( STATUS_CLASSIC_INVALID_ADDRESS, EFAULT ),

cpukit/include/rtems/score/threadimpl.h

@@ -2699 +2699 @@
  *
  * @param[in, out] the_thread is the thread.
+ *
+ * @param status is the thread wait status.
  */
 RTEMS_INLINE_ROUTINE void _Thread_Timer_remove_and_continue(
-  Thread_Control *the_thread
+  Thread_Control *the_thread,
+  Status_Control  status
 )
 {
@@ -2708 +2711 @@
   _Thread_MP_Extract_proxy( the_thread );
 #endif
-  _Thread_queue_Extract( the_thread );
+  _Thread_Continue( the_thread, status );
 }
 

cpukit/posix/src/psignalunblockthread.c

@@ -176 +176 @@
 }
 
-static void _POSIX_signals_Interrupt_thread( Thread_Control *the_thread )
-{
-#if defined(RTEMS_MULTIPROCESSING)
-  _Thread_MP_Extract_proxy( the_thread );
-#endif
-  the_thread->Wait.return_code = STATUS_INTERRUPTED;
-  _Thread_queue_Extract( the_thread );
-}
-
 bool _POSIX_signals_Unblock_thread(
   Thread_Control  *the_thread,
@@ -216 +207 @@
       }
 
-      _POSIX_signals_Interrupt_thread( the_thread );
+      _Thread_Timer_remove_and_continue( the_thread, STATUS_INTERRUPTED );
       return _POSIX_signals_Unblock_thread_done( the_thread, api, true );
     }
@@ -246 +237 @@
 
     if ( _States_Is_interruptible_by_signal( the_thread->current_state ) ) {
-      _POSIX_signals_Interrupt_thread( the_thread );
+      _Thread_Timer_remove_and_continue( the_thread, STATUS_INTERRUPTED );
     }
   }

cpukit/score/src/threadrestart.c

@@ -138 +138 @@
 
   _Thread_Set_state( the_thread, STATES_ZOMBIE );
-  _Thread_Timer_remove_and_continue( the_thread );
+  _Thread_Timer_remove_and_continue( the_thread, STATUS_INTERNAL_ERROR );
 
   /*
@@ -358 +358 @@
      * SMP configurations.  We could interrupt an extract operation on another
      * processor disregarding the thread wait flags.  Rely on
-     * _Thread_queue_Extract() for removal of these states.
+     * _Thread_Continue() for removal of these states.
      */
     _Thread_Clear_state_locked(
@@ -409 +409 @@
     _Thread_State_release( the_thread, lock_context );
 
-    _Thread_Timer_remove_and_continue( the_thread );
+    _Thread_Timer_remove_and_continue( the_thread, STATUS_INTERNAL_ERROR );
     _Thread_Remove_life_change_request( the_thread );
   } else {