RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

score: Simplify calling _Thread_Exit()

Browse Source 
Move common code into _Thread_Exit().  This enables a tail call
optimization in most cases.
This commit is contained in:
Sebastian Huber
2021-05-17 14:46:02 +02:00
parent b81d1ffd23
commit 3cef3198a5
6 changed files with 28 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cpukit/include/rtems/score/threadimpl.h
View File

@@ -339,14 +339,13 @@ void _Thread_Kill_zombies( void );
/**
* @brief Exits the currently executing thread.
*
* @param[in, out] executing The currently executing thread.
* @param life_states_to_set The states to set.
* @param[out] exit_value Contains the exit value of the thread.
* @param exit_value is the exit value of the thread.
*
* @param life_states_to_set are the thread life states to set.
*/
void _Thread_Exit(
Thread_Control *executing,
Thread_Life_state life_states_to_set,
void *exit_value
RTEMS_NO_RETURN void _Thread_Exit(
void *exit_value,
Thread_Life_state life_states_to_set
);
/**

12
cpukit/posix/src/cancel.c
View File

@@ -52,17 +52,17 @@ int pthread_cancel( pthread_t thread )
return ESRCH;
}
cpu_self = _Thread_Dispatch_disable_critical( &lock_context );
_ISR_lock_ISR_enable( &lock_context );
cpu_self = _Per_CPU_Get();
executing = _Per_CPU_Get_executing( cpu_self );
if ( the_thread == executing ) {
_Thread_Exit( executing, THREAD_LIFE_TERMINATING, PTHREAD_CANCELED );
_ISR_lock_ISR_enable( &lock_context );
_Thread_Exit( PTHREAD_CANCELED, THREAD_LIFE_TERMINATING );
} else {
_Thread_Dispatch_disable_with_CPU( cpu_self, &lock_context );
_ISR_lock_ISR_enable( &lock_context );
_Thread_Cancel( the_thread, executing, PTHREAD_CANCELED );
_Thread_Dispatch_enable( cpu_self );
}
_Thread_Dispatch_enable( cpu_self );
return 0;
}

11
cpukit/posix/src/pthreadexit.c
View File

@@ -27,14 +27,5 @@
void pthread_exit( void *value_ptr )
{
Thread_Control *executing;
Per_CPU_Control *cpu_self;
cpu_self = _Thread_Dispatch_disable();
executing = _Per_CPU_Get_executing( cpu_self );
_Thread_Exit( executing, THREAD_LIFE_TERMINATING, value_ptr );
_Thread_Dispatch_direct_no_return( cpu_self );
RTEMS_UNREACHABLE();
_Thread_Exit( value_ptr, THREAD_LIFE_TERMINATING );
}

12
cpukit/rtems/src/taskdelete.c
View File

@@ -55,23 +55,13 @@ rtems_status_code rtems_task_delete(
executing = _Per_CPU_Get_executing( cpu_self );
if ( the_thread == executing ) {
_Thread_Dispatch_disable_with_CPU(
cpu_self,
&context.Base.Lock_context.Lock_context
);
_ISR_lock_ISR_enable( &context.Base.Lock_context.Lock_context );
/*
* The Classic tasks are neither detached nor joinable. In case of
* self deletion, they are detached, otherwise joinable by default.
*/
_Thread_Exit(
executing,
THREAD_LIFE_TERMINATING | THREAD_LIFE_DETACHED,
NULL
);
_Thread_Dispatch_direct_no_return( cpu_self );
RTEMS_UNREACHABLE();
_Thread_Exit( NULL, THREAD_LIFE_TERMINATING | THREAD_LIFE_DETACHED );
} else {
_Thread_Close( the_thread, executing, &context );
}

15
cpukit/rtems/src/taskexit.c
View File

@@ -30,18 +30,5 @@
void rtems_task_exit( void )
{
Thread_Control *executing;
Per_CPU_Control *cpu_self;
cpu_self = _Thread_Dispatch_disable();
executing = _Per_CPU_Get_executing( cpu_self );
_Thread_Exit(
executing,
THREAD_LIFE_TERMINATING | THREAD_LIFE_DETACHED,
NULL
);
_Thread_Dispatch_direct_no_return( cpu_self );
RTEMS_UNREACHABLE();
_Thread_Exit( NULL, THREAD_LIFE_TERMINATING | THREAD_LIFE_DETACHED );
}

18
cpukit/score/src/threadrestart.c
View File

@@ -489,14 +489,19 @@ void _Thread_Close(
);
}
void _Thread_Exit(
Thread_Control *executing,
Thread_Life_state life_states_to_set,
void *exit_value
RTEMS_NO_RETURN void _Thread_Exit(
void *exit_value,
Thread_Life_state life_states_to_set
)
{
Per_CPU_Control *cpu_self;
Thread_Control *executing;
ISR_lock_Context lock_context;
_ISR_lock_ISR_disable( &lock_context );
cpu_self = _Thread_Dispatch_disable_critical( &lock_context );
executing = _Per_CPU_Get_executing( cpu_self );
_Assert(
_Watchdog_Get_state( &executing->Timer.Watchdog ) == WATCHDOG_INACTIVE
);
@@ -505,7 +510,7 @@ void _Thread_Exit(
|| executing->current_state == STATES_SUSPENDED
);
_Thread_State_acquire( executing, &lock_context );
_Thread_State_acquire_critical( executing, &lock_context );
_Thread_Set_exit_value( executing, exit_value );
_Thread_Change_life_locked(
executing,
@@ -514,6 +519,9 @@ void _Thread_Exit(
THREAD_LIFE_PROTECTED | THREAD_LIFE_CHANGE_DEFERRED
);
_Thread_State_release( executing, &lock_context );
_Thread_Dispatch_direct_no_return( cpu_self );
RTEMS_UNREACHABLE();
}
Status_Control _Thread_Restart(