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

posix: Simplify cleanup push/pop

Browse Source 
The POSIX cleanup list must be proteced from asynchronous thread
deletion.  Here local interrupt disable is sufficient.
This commit is contained in:
Sebastian Huber
2016-11-09 16:29:17 +01:00
parent 1897fa6d82
commit 0e658d456c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cpukit/posix/src/cleanuppush.c
View File

@@ -31,8 +31,8 @@ void _pthread_cleanup_push(
void *arg void *arg
) )
{ {
Per_CPU_Control *cpu_self; ISR_Level level;
Thread_Control *executing; Thread_Control *executing;
context->_routine = routine; context->_routine = routine;
context->_arg = arg; context->_arg = arg;
@@ -40,13 +40,13 @@ void _pthread_cleanup_push(
/* This value is unused, just provide a deterministic value */ /* This value is unused, just provide a deterministic value */
context->_canceltype = -1; context->_canceltype = -1;
cpu_self = _Thread_Dispatch_disable(); _ISR_Local_disable( level );
executing = _Per_CPU_Get_executing( cpu_self ); executing = _Thread_Executing;
context->_previous = executing->last_cleanup_context; context->_previous = executing->last_cleanup_context;
executing->last_cleanup_context = context; executing->last_cleanup_context = context;
_Thread_Dispatch_enable( cpu_self ); _ISR_Local_enable( level );
} }
void _pthread_cleanup_pop( void _pthread_cleanup_pop(
@@ -54,19 +54,19 @@ void _pthread_cleanup_pop(
int execute int execute
) )
{ {
Per_CPU_Control *cpu_self; ISR_Level level;
Thread_Control *executing; Thread_Control *executing;
if ( execute != 0 ) { if ( execute != 0 ) {
( *context->_routine )( context->_arg ); ( *context->_routine )( context->_arg );
} }
cpu_self = _Thread_Dispatch_disable(); _ISR_Local_disable( level );
executing = _Per_CPU_Get_executing( cpu_self ); executing = _Thread_Executing;
executing->last_cleanup_context = context->_previous; executing->last_cleanup_context = context->_previous;
_Thread_Dispatch_enable( cpu_self ); _ISR_Local_enable( level );
} }
static void _POSIX_Cleanup_terminate_extension( Thread_Control *the_thread ) static void _POSIX_Cleanup_terminate_extension( Thread_Control *the_thread )