From 3cef3198a560d2c9e16afb81f97e05bdc6f13a01 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 17 May 2021 14:46:02 +0200 Subject: score: Simplify calling _Thread_Exit() Move common code into _Thread_Exit(). This enables a tail call optimization in most cases. --- cpukit/rtems/src/taskdelete.c | 12 +----------- cpukit/rtems/src/taskexit.c | 15 +-------------- 2 files changed, 2 insertions(+), 25 deletions(-) (limited to 'cpukit/rtems/src') diff --git a/cpukit/rtems/src/taskdelete.c b/cpukit/rtems/src/taskdelete.c index 0a8d59a3a8..05321934ff 100644 --- a/cpukit/rtems/src/taskdelete.c +++ b/cpukit/rtems/src/taskdelete.c @@ -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 ); } diff --git a/cpukit/rtems/src/taskexit.c b/cpukit/rtems/src/taskexit.c index 4c8420d255..178e668581 100644 --- a/cpukit/rtems/src/taskexit.c +++ b/cpukit/rtems/src/taskexit.c @@ -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 ); } -- cgit v1.2.3