diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-11-11 08:44:29 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-11-23 11:00:28 +0100 |
| commit | 546846472a5dadc7b3038b7c56da695f6dbbd1a6 (patch) | |
| tree | 064b790fd0ab99efbff045f325fdc012015ac72a /cpukit/include | |
| parent | score: _Thread_queue_Surrender_no_priority() (diff) | |
| download | rtems-546846472a5dadc7b3038b7c56da695f6dbbd1a6.tar.bz2 | |
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.
Diffstat (limited to 'cpukit/include')
| -rw-r--r-- | cpukit/include/rtems/score/status.h | 2 | ||||
| -rw-r--r-- | cpukit/include/rtems/score/threadimpl.h | 7 |
2 files changed, 7 insertions, 2 deletions
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 |