From 546846472a5dadc7b3038b7c56da695f6dbbd1a6 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 11 Nov 2021 08:44:29 +0100 Subject: 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. --- cpukit/include/rtems/score/status.h | 2 ++ cpukit/include/rtems/score/threadimpl.h | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'cpukit/include/rtems') diff --git a/cpukit/include/rtems/score/status.h b/cpukit/include/rtems/score/status.h index 236ae52d7b..96c0f1f9af 100644 --- a/cpukit/include/rtems/score/status.h +++ b/cpukit/include/rtems/score/status.h @@ -106,6 +106,8 @@ typedef enum { STATUS_BUILD( STATUS_CLASSIC_INCORRECT_STATE, EINVAL ), 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 ), STATUS_INVALID_ID = diff --git a/cpukit/include/rtems/score/threadimpl.h b/cpukit/include/rtems/score/threadimpl.h index a66d1a5346..0a672aa837 100644 --- a/cpukit/include/rtems/score/threadimpl.h +++ b/cpukit/include/rtems/score/threadimpl.h @@ -2698,16 +2698,19 @@ extern "C" { * continue its execution. * * @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 ) { _Thread_Timer_remove( the_thread ); #if defined(RTEMS_MULTIPROCESSING) _Thread_MP_Extract_proxy( the_thread ); #endif - _Thread_queue_Extract( the_thread ); + _Thread_Continue( the_thread, status ); } #ifdef __cplusplus -- cgit v1.2.3