diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-06-29 23:19:28 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-06-29 23:19:28 +0000 |
commit | 290d2b79fefb3419fa84d72a5463cea134976581 (patch) | |
tree | 97069e1a59f85eea47ffe3803c88b6ca9f972138 /cpukit | |
parent | 2009-06-29 Xi Yang <hiyangxi@gmail.com> (diff) | |
download | rtems-290d2b79fefb3419fa84d72a5463cea134976581.tar.bz2 |
2009-06-29 Joel Sherrill <joel.sherrill@oarcorp.com>
* posix/src/killinfo.c, posix/src/mutexinit.c, posix/src/psignal.c,
posix/src/psignalchecksignal.c, posix/src/pthread.c,
posix/src/pthreadexit.c, posix/src/pthreadinitthreads.c: Remove
includes of <assert.h> where possible. Make other uses conditional on
ifdef RTEMS_DEBUG.
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/ChangeLog | 8 | ||||
-rw-r--r-- | cpukit/posix/src/killinfo.c | 1 | ||||
-rw-r--r-- | cpukit/posix/src/mutexinit.c | 15 | ||||
-rw-r--r-- | cpukit/posix/src/psignal.c | 15 | ||||
-rw-r--r-- | cpukit/posix/src/psignalchecksignal.c | 4 | ||||
-rw-r--r-- | cpukit/posix/src/pthread.c | 1 | ||||
-rw-r--r-- | cpukit/posix/src/pthreadexit.c | 1 | ||||
-rw-r--r-- | cpukit/posix/src/pthreadinitthreads.c | 1 |
8 files changed, 26 insertions, 20 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 39d0bba0ba..c076869257 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,11 @@ +2009-06-29 Joel Sherrill <joel.sherrill@oarcorp.com> + + * posix/src/killinfo.c, posix/src/mutexinit.c, posix/src/psignal.c, + posix/src/psignalchecksignal.c, posix/src/pthread.c, + posix/src/pthreadexit.c, posix/src/pthreadinitthreads.c: Remove + includes of <assert.h> where possible. Make other uses conditional on + ifdef RTEMS_DEBUG. + 2009-06-24 Joel Sherrill <joel.sherrill@oarcorp.com> * posix/Makefile.am, posix/include/rtems/posix/priority.h, diff --git a/cpukit/posix/src/killinfo.c b/cpukit/posix/src/killinfo.c index e44016d125..e7c6c862d8 100644 --- a/cpukit/posix/src/killinfo.c +++ b/cpukit/posix/src/killinfo.c @@ -18,7 +18,6 @@ #include <pthread.h> #include <signal.h> #include <errno.h> -#include <assert.h> #include <rtems/system.h> #include <rtems/posix/pthread.h> diff --git a/cpukit/posix/src/mutexinit.c b/cpukit/posix/src/mutexinit.c index 5fe81d100b..353049a879 100644 --- a/cpukit/posix/src/mutexinit.c +++ b/cpukit/posix/src/mutexinit.c @@ -13,7 +13,6 @@ #include "config.h" #endif -#include <assert.h> #include <errno.h> #include <pthread.h> @@ -50,7 +49,6 @@ int pthread_mutex_init( else the_attr = &_POSIX_Mutex_Default_attributes; /* Check for NULL mutex */ - if ( !mutex ) return EINVAL; @@ -98,18 +96,17 @@ int pthread_mutex_init( return EINVAL; /* - * XXX: Be careful about attributes when global!!! + * We only support process private mutexes. */ - - assert( the_attr->process_shared == PTHREAD_PROCESS_PRIVATE ); - if ( the_attr->process_shared == PTHREAD_PROCESS_SHARED ) return ENOSYS; + if ( the_attr->process_shared != PTHREAD_PROCESS_PRIVATE ) + return EINVAL; + /* * Determine the discipline of the mutex */ - switch ( the_attr->protocol ) { case PTHREAD_PRIO_NONE: the_discipline = CORE_MUTEX_DISCIPLINES_FIFO; @@ -127,6 +124,9 @@ int pthread_mutex_init( if ( !_POSIX_Priority_Is_valid( the_attr->prio_ceiling ) ) return EINVAL; + /* + * Enter a dispatching critical section and begin to do the real work. + */ _Thread_Disable_dispatch(); the_mutex = _POSIX_Mutex_Allocate(); @@ -152,7 +152,6 @@ int pthread_mutex_init( /* * Must be initialized to unlocked. */ - _CORE_mutex_Initialize( &the_mutex->Mutex, the_mutex_attr, diff --git a/cpukit/posix/src/psignal.c b/cpukit/posix/src/psignal.c index 3d8b8d80e5..922908724e 100644 --- a/cpukit/posix/src/psignal.c +++ b/cpukit/posix/src/psignal.c @@ -13,7 +13,9 @@ #include "config.h" #endif -#include <assert.h> +#if defined(RTEMS_DEBUG) + #include <assert.h> +#endif #include <errno.h> #include <pthread.h> #include <signal.h> @@ -172,9 +174,11 @@ void _POSIX_signals_Manager_Initialization(void) * Ensure we have the same number of vectors and default vector entries */ - assert( - sizeof(_POSIX_signals_Vectors) == sizeof(_POSIX_signals_Default_vectors) - ); + #if defined(RTEMS_DEBUG) + assert( + sizeof(_POSIX_signals_Vectors) == sizeof(_POSIX_signals_Default_vectors) + ); + #endif memcpy( _POSIX_signals_Vectors, @@ -185,13 +189,11 @@ void _POSIX_signals_Manager_Initialization(void) /* * Initialize the set of pending signals for the entire process */ - sigemptyset( &_POSIX_signals_Pending ); /* * Initialize the queue we use to block for signals */ - _Thread_queue_Initialize( &_POSIX_signals_Wait_queue, THREAD_QUEUE_DISCIPLINE_PRIORITY, @@ -204,7 +206,6 @@ void _POSIX_signals_Manager_Initialization(void) /* * Allocate the siginfo pools. */ - for ( signo=1 ; signo<= SIGRTMAX ; signo++ ) _Chain_Initialize_empty( &_POSIX_signals_Siginfo[ signo ] ); diff --git a/cpukit/posix/src/psignalchecksignal.c b/cpukit/posix/src/psignalchecksignal.c index 20bc24daef..1ed3bacdf7 100644 --- a/cpukit/posix/src/psignalchecksignal.c +++ b/cpukit/posix/src/psignalchecksignal.c @@ -13,7 +13,9 @@ #include "config.h" #endif -#include <assert.h> +#if defined(RTEMS_DEBUG) + #include <assert.h> +#endif #include <errno.h> #include <pthread.h> #include <signal.h> diff --git a/cpukit/posix/src/pthread.c b/cpukit/posix/src/pthread.c index ae42dbe3fa..fad0845dd7 100644 --- a/cpukit/posix/src/pthread.c +++ b/cpukit/posix/src/pthread.c @@ -13,7 +13,6 @@ #include "config.h" #endif -#include <assert.h> #include <errno.h> #include <pthread.h> #include <limits.h> diff --git a/cpukit/posix/src/pthreadexit.c b/cpukit/posix/src/pthreadexit.c index f85e736daa..c5eda2e02c 100644 --- a/cpukit/posix/src/pthreadexit.c +++ b/cpukit/posix/src/pthreadexit.c @@ -19,7 +19,6 @@ #include <pthread.h> #include <errno.h> -#include <assert.h> #include <rtems/system.h> #include <rtems/score/apimutex.h> diff --git a/cpukit/posix/src/pthreadinitthreads.c b/cpukit/posix/src/pthreadinitthreads.c index 700b063ba4..b7c0fdec3b 100644 --- a/cpukit/posix/src/pthreadinitthreads.c +++ b/cpukit/posix/src/pthreadinitthreads.c @@ -13,7 +13,6 @@ #include "config.h" #endif -#include <assert.h> #include <errno.h> #include <pthread.h> #include <limits.h> |