diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-11-24 15:58:26 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-11-24 16:00:14 +0100 |
| commit | f6a1ef9fdb9df6beea4251f4440f6db5c6a473b9 (patch) | |
| tree | 7359a0b2c5a3e8e16da7facaaf46041fc4ef1462 /cpukit/posix/src/cleanuppop.c | |
| parent | bsp/altera-cyclone-v: Add fatal extension handler (diff) | |
| download | rtems-f6a1ef9fdb9df6beea4251f4440f6db5c6a473b9.tar.bz2 | |
posix: Require struct _pthread_cleanup_context
This structure is available in Newlib since 2013-11-29 (Git commit
a534dfd26e765047621acd0eda656ded886e7108).
Diffstat (limited to 'cpukit/posix/src/cleanuppop.c')
| -rw-r--r-- | cpukit/posix/src/cleanuppop.c | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/cpukit/posix/src/cleanuppop.c b/cpukit/posix/src/cleanuppop.c index e8ddc388bd..081c97af66 100644 --- a/cpukit/posix/src/cleanuppop.c +++ b/cpukit/posix/src/cleanuppop.c @@ -24,66 +24,6 @@ #include <rtems/score/threaddispatch.h> #include <rtems/posix/threadsup.h> -#ifndef HAVE_STRUCT__PTHREAD_CLEANUP_CONTEXT - -#include <rtems/score/chainimpl.h> -#include <rtems/score/isr.h> -#include <rtems/score/wkspace.h> -#include <rtems/posix/cancel.h> -#include <rtems/posix/pthreadimpl.h> - -/* - * 18.2.3.1 Establishing Cancellation Handlers, P1003.1c/Draft 10, p. 184 - */ - -void pthread_cleanup_pop( - int execute -) -{ - POSIX_Cancel_Handler_control *handler; - POSIX_Cancel_Handler_control tmp_handler; - Chain_Control *handler_stack; - POSIX_API_Control *thread_support; - ISR_Level level; - - thread_support = _Thread_Executing->API_Extensions[ THREAD_API_POSIX ]; - - handler_stack = &thread_support->Cancellation_Handlers; - - /* - * We need interrupts disabled to safely check the chain and pull - * the last element off. But we also need dispatching disabled to - * ensure that we do not get prempted and deleted while we are holding - * memory that needs to be freed. - */ - - _Thread_Disable_dispatch(); - _ISR_Disable( level ); - - if ( _Chain_Is_empty( handler_stack ) ) { - _Thread_Enable_dispatch(); - _ISR_Enable( level ); - return; - } - - handler = (POSIX_Cancel_Handler_control *) - _Chain_Tail( handler_stack )->previous; - _Chain_Extract_unprotected( &handler->Node ); - - _ISR_Enable( level ); - - tmp_handler = *handler; - - _Workspace_Free( handler ); - - _Thread_Enable_dispatch(); - - if ( execute ) - (*tmp_handler.routine)( tmp_handler.arg ); -} - -#else /* HAVE_STRUCT__PTHREAD_CLEANUP_CONTEXT */ - void _pthread_cleanup_pop( struct _pthread_cleanup_context *context, int execute @@ -102,5 +42,3 @@ void _pthread_cleanup_pop( _Thread_Enable_dispatch(); } - -#endif /* HAVE_STRUCT__PTHREAD_CLEANUP_CONTEXT */ |