diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-10-26 20:19:02 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-10-26 20:19:02 +0000 |
commit | 0e87deaa296733d0ac599bbc1b224c0232b8fc69 (patch) | |
tree | 53636dee7c321484a2885bdbeb74ffa231282ea2 /cpukit/posix/src | |
parent | 2007-10-26 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-0e87deaa296733d0ac599bbc1b224c0232b8fc69.tar.bz2 |
2007-10-26 Joel Sherrill <joel.sherrill@OARcorp.com>
* itron/src/can_wup.c, itron/src/chg_pri.c, itron/src/del_mbf.c,
itron/src/del_mbx.c, itron/src/del_sem.c, itron/src/del_tsk.c,
itron/src/frsm_tsk.c, itron/src/ref_mbf.c, itron/src/ref_mbx.c,
itron/src/ref_sem.c, itron/src/ref_tsk.c, itron/src/rel_wai.c,
itron/src/rsm_tsk.c, itron/src/sig_sem.c, itron/src/snd_mbx.c,
itron/src/sta_tsk.c, itron/src/sus_tsk.c, itron/src/ter_tsk.c,
itron/src/trcv_mbf.c, itron/src/trcv_mbx.c, itron/src/tsnd_mbf.c,
itron/src/twai_sem.c, posix/src/cancel.c, posix/src/conddestroy.c,
posix/src/condinit.c, posix/src/condsignalsupp.c,
posix/src/condwaitsupp.c, posix/src/keydelete.c,
posix/src/keygetspecific.c, posix/src/keysetspecific.c,
posix/src/mqueueclose.c, posix/src/mqueuegetattr.c,
posix/src/mqueuenotify.c, posix/src/mqueuerecvsupp.c,
posix/src/mqueuesendsupp.c, posix/src/mqueuesetattr.c,
posix/src/mutexdestroy.c, posix/src/mutexgetprioceiling.c,
posix/src/mutexinit.c, posix/src/mutexlocksupp.c,
posix/src/mutexsetprioceiling.c, posix/src/mutexunlock.c,
posix/src/pbarrierdestroy.c, posix/src/pbarrierwait.c,
posix/src/prwlockdestroy.c, posix/src/prwlockrdlock.c,
posix/src/prwlocktimedrdlock.c, posix/src/prwlocktimedwrlock.c,
posix/src/prwlocktryrdlock.c, posix/src/prwlocktrywrlock.c,
posix/src/prwlockunlock.c, posix/src/prwlockwrlock.c,
posix/src/pspindestroy.c, posix/src/pspinlock.c,
posix/src/pspintrylock.c, posix/src/pspinunlock.c,
posix/src/pthreaddetach.c, posix/src/pthreadequal.c,
posix/src/pthreadgetschedparam.c, posix/src/pthreadjoin.c,
posix/src/pthreadkill.c, posix/src/pthreadsetschedparam.c,
posix/src/ptimer1.c, posix/src/semaphorewaitsupp.c,
posix/src/semclose.c, posix/src/semdestroy.c,
posix/src/semgetvalue.c, posix/src/sempost.c, posix/src/types.c,
rtems/src/barrierdelete.c, rtems/src/barrierrelease.c,
rtems/src/barrierwait.c, rtems/src/dpmemdelete.c,
rtems/src/dpmemexternal2internal.c,
rtems/src/dpmeminternal2external.c, rtems/src/eventsend.c,
rtems/src/eventtimeout.c, rtems/src/msgqbroadcast.c,
rtems/src/msgqdelete.c, rtems/src/msgqflush.c,
rtems/src/msgqgetnumberpending.c, rtems/src/msgqreceive.c,
rtems/src/msgqsend.c, rtems/src/msgqurgent.c, rtems/src/partdelete.c,
rtems/src/partgetbuffer.c, rtems/src/partreturnbuffer.c,
rtems/src/ratemoncancel.c, rtems/src/ratemondelete.c,
rtems/src/ratemongetstatistics.c, rtems/src/ratemongetstatus.c,
rtems/src/ratemonperiod.c, rtems/src/ratemonresetstatistics.c,
rtems/src/ratemontimeout.c, rtems/src/regiondelete.c,
rtems/src/regionextend.c, rtems/src/regiongetfreeinfo.c,
rtems/src/regiongetinfo.c, rtems/src/regiongetsegment.c,
rtems/src/regiongetsegmentsize.c, rtems/src/regionresizesegment.c,
rtems/src/regionreturnsegment.c, rtems/src/semdelete.c,
rtems/src/semflush.c, rtems/src/semobtain.c, rtems/src/semrelease.c,
rtems/src/signalsend.c, rtems/src/taskdelete.c,
rtems/src/taskgetnote.c, rtems/src/taskissuspended.c,
rtems/src/taskrestart.c, rtems/src/taskresume.c,
rtems/src/tasksetnote.c, rtems/src/tasksetpriority.c,
rtems/src/taskstart.c, rtems/src/tasksuspend.c,
rtems/src/taskvariableadd.c, rtems/src/taskvariabledelete.c,
rtems/src/taskvariableget.c, rtems/src/timercancel.c,
rtems/src/timerdelete.c, rtems/src/timerfireafter.c,
rtems/src/timerfirewhen.c, rtems/src/timergetinfo.c,
rtems/src/timerreset.c, rtems/src/timerserverfireafter.c,
rtems/src/timerserverfirewhen.c, sapi/src/extensiondelete.c,
score/include/rtems/score/object.h, score/src/corerwlocktimeout.c,
score/src/mpci.c, score/src/objectgetnameasstring.c,
score/src/threaddelayended.c, score/src/threadqtimeout.c: When
multiprocessing is disabled, do not even allow the constant
OBJECTS_REMOTE to appear in the source. Even at -O2, the presence of
a case OBJECTS_REMOTE in each id->pointer _Objects_Get switch results
in the generation of binary code which can NOT be reached.
Diffstat (limited to 'cpukit/posix/src')
47 files changed, 114 insertions, 40 deletions
diff --git a/cpukit/posix/src/cancel.c b/cpukit/posix/src/cancel.c index 2b72be4aef..0ec720fa2e 100644 --- a/cpukit/posix/src/cancel.c +++ b/cpukit/posix/src/cancel.c @@ -42,8 +42,10 @@ int pthread_cancel( switch ( location ) { case OBJECTS_ERROR: return EINVAL; +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: return POSIX_MP_NOT_IMPLEMENTED(); +#endif case OBJECTS_LOCAL: thread_support = the_thread->API_Extensions[ THREAD_API_POSIX ]; diff --git a/cpukit/posix/src/conddestroy.c b/cpukit/posix/src/conddestroy.c index 43f7045de6..182e7d8fed 100644 --- a/cpukit/posix/src/conddestroy.c +++ b/cpukit/posix/src/conddestroy.c @@ -32,8 +32,8 @@ int pthread_cond_destroy( the_cond = _POSIX_Condition_variables_Get( cond, &location ); switch ( location ) { - case OBJECTS_REMOTE: #if defined(RTEMS_MULTIPROCESSING) + case OBJECTS_REMOTE: _Thread_Dispatch(); return POSIX_MP_NOT_IMPLEMENTED(); return EINVAL; diff --git a/cpukit/posix/src/condinit.c b/cpukit/posix/src/condinit.c index 319cd4383a..6767ee3dd4 100644 --- a/cpukit/posix/src/condinit.c +++ b/cpukit/posix/src/condinit.c @@ -39,7 +39,7 @@ int pthread_cond_init( */ if ( the_attr->process_shared == PTHREAD_PROCESS_SHARED ) - return POSIX_MP_NOT_IMPLEMENTED(); + return EINVAL; if ( !the_attr->is_initialized ) return EINVAL; diff --git a/cpukit/posix/src/condsignalsupp.c b/cpukit/posix/src/condsignalsupp.c index 5fad8e0ead..016ef9b7b8 100644 --- a/cpukit/posix/src/condsignalsupp.c +++ b/cpukit/posix/src/condsignalsupp.c @@ -36,8 +36,8 @@ int _POSIX_Condition_variables_Signal_support( the_cond = _POSIX_Condition_variables_Get( cond, &location ); switch ( location ) { - case OBJECTS_REMOTE: #if defined(RTEMS_MULTIPROCESSING) + case OBJECTS_REMOTE: _Thread_Dispatch(); return POSIX_MP_NOT_IMPLEMENTED(); return EINVAL; diff --git a/cpukit/posix/src/condwaitsupp.c b/cpukit/posix/src/condwaitsupp.c index 02780779bf..a93a6306b3 100644 --- a/cpukit/posix/src/condwaitsupp.c +++ b/cpukit/posix/src/condwaitsupp.c @@ -45,8 +45,8 @@ int _POSIX_Condition_variables_Wait_support( the_cond = _POSIX_Condition_variables_Get( cond, &location ); switch ( location ) { - case OBJECTS_REMOTE: #if defined(RTEMS_MULTIPROCESSING) + case OBJECTS_REMOTE: _Thread_Dispatch(); return POSIX_MP_NOT_IMPLEMENTED(); return EINVAL; diff --git a/cpukit/posix/src/keydelete.c b/cpukit/posix/src/keydelete.c index 364108046b..65b5d8e8df 100644 --- a/cpukit/posix/src/keydelete.c +++ b/cpukit/posix/src/keydelete.c @@ -31,8 +31,10 @@ int pthread_key_delete( the_key = _POSIX_Keys_Get( key, &location ); switch ( location ) { - case OBJECTS_ERROR: +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: /* should never happen */ +#endif + case OBJECTS_ERROR: return EINVAL; case OBJECTS_LOCAL: _Objects_Close( &_POSIX_Keys_Information, &the_key->Object ); diff --git a/cpukit/posix/src/keygetspecific.c b/cpukit/posix/src/keygetspecific.c index 01e5549512..6af4f3d8b7 100644 --- a/cpukit/posix/src/keygetspecific.c +++ b/cpukit/posix/src/keygetspecific.c @@ -33,8 +33,10 @@ void *pthread_getspecific( the_key = _POSIX_Keys_Get( key, &location ); switch ( location ) { - case OBJECTS_ERROR: +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: /* should never happen */ +#endif + case OBJECTS_ERROR: return NULL; case OBJECTS_LOCAL: api = _Objects_Get_API( _Thread_Executing->Object.id ); diff --git a/cpukit/posix/src/keysetspecific.c b/cpukit/posix/src/keysetspecific.c index 63370b4adf..f510af4e5b 100644 --- a/cpukit/posix/src/keysetspecific.c +++ b/cpukit/posix/src/keysetspecific.c @@ -33,8 +33,10 @@ int pthread_setspecific( the_key = _POSIX_Keys_Get( key, &location ); switch ( location ) { - case OBJECTS_ERROR: +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: /* should never happen */ +#endif + case OBJECTS_ERROR: return EINVAL; case OBJECTS_LOCAL: api = _Objects_Get_API( _Thread_Executing->Object.id ); diff --git a/cpukit/posix/src/mqueueclose.c b/cpukit/posix/src/mqueueclose.c index 9254bbf25b..0187cae797 100644 --- a/cpukit/posix/src/mqueueclose.c +++ b/cpukit/posix/src/mqueueclose.c @@ -49,10 +49,12 @@ int mq_close( switch ( location ) { case OBJECTS_ERROR: rtems_set_errno_and_return_minus_one( EBADF ); +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: _Thread_Dispatch(); return POSIX_MP_NOT_IMPLEMENTED(); rtems_set_errno_and_return_minus_one( EINVAL ); +#endif case OBJECTS_LOCAL: /* * First update the actual message queue to reflect this descriptor diff --git a/cpukit/posix/src/mqueuegetattr.c b/cpukit/posix/src/mqueuegetattr.c index d5cb7ababb..d4397a2f45 100644 --- a/cpukit/posix/src/mqueuegetattr.c +++ b/cpukit/posix/src/mqueuegetattr.c @@ -54,10 +54,12 @@ int mq_getattr( switch ( location ) { case OBJECTS_ERROR: rtems_set_errno_and_return_minus_one( EBADF ); +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: _Thread_Dispatch(); return POSIX_MP_NOT_IMPLEMENTED(); rtems_set_errno_and_return_minus_one( EINVAL ); +#endif case OBJECTS_LOCAL: the_mq = the_mq_fd->Queue; diff --git a/cpukit/posix/src/mqueuenotify.c b/cpukit/posix/src/mqueuenotify.c index 5733346e16..fa36bcd003 100644 --- a/cpukit/posix/src/mqueuenotify.c +++ b/cpukit/posix/src/mqueuenotify.c @@ -72,10 +72,12 @@ int mq_notify( switch ( location ) { case OBJECTS_ERROR: rtems_set_errno_and_return_minus_one( EBADF ); +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: _Thread_Dispatch(); return POSIX_MP_NOT_IMPLEMENTED(); rtems_set_errno_and_return_minus_one( EINVAL ); +#endif case OBJECTS_LOCAL: the_mq = the_mq_fd->Queue; diff --git a/cpukit/posix/src/mqueuerecvsupp.c b/cpukit/posix/src/mqueuerecvsupp.c index d97db51642..93fd000222 100644 --- a/cpukit/posix/src/mqueuerecvsupp.c +++ b/cpukit/posix/src/mqueuerecvsupp.c @@ -57,10 +57,12 @@ ssize_t _POSIX_Message_queue_Receive_support( switch ( location ) { case OBJECTS_ERROR: rtems_set_errno_and_return_minus_one( EBADF ); +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: _Thread_Dispatch(); return POSIX_MP_NOT_IMPLEMENTED(); rtems_set_errno_and_return_minus_one( EINVAL ); +#endif case OBJECTS_LOCAL: if ( (the_mq_fd->oflag & O_ACCMODE) == O_WRONLY ) { _Thread_Enable_dispatch(); diff --git a/cpukit/posix/src/mqueuesendsupp.c b/cpukit/posix/src/mqueuesendsupp.c index f02df6ddfe..7531507055 100644 --- a/cpukit/posix/src/mqueuesendsupp.c +++ b/cpukit/posix/src/mqueuesendsupp.c @@ -64,10 +64,12 @@ int _POSIX_Message_queue_Send_support( case OBJECTS_ERROR: rtems_set_errno_and_return_minus_one( EBADF ); +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: _Thread_Dispatch(); return POSIX_MP_NOT_IMPLEMENTED(); rtems_set_errno_and_return_minus_one( EINVAL ); +#endif case OBJECTS_LOCAL: if ( (the_mq_fd->oflag & O_ACCMODE) == O_RDONLY ) { diff --git a/cpukit/posix/src/mqueuesetattr.c b/cpukit/posix/src/mqueuesetattr.c index 6d3b132ade..a7bc8a6b72 100644 --- a/cpukit/posix/src/mqueuesetattr.c +++ b/cpukit/posix/src/mqueuesetattr.c @@ -54,10 +54,12 @@ int mq_setattr( switch ( location ) { case OBJECTS_ERROR: rtems_set_errno_and_return_minus_one( EBADF ); +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: _Thread_Dispatch(); return POSIX_MP_NOT_IMPLEMENTED(); rtems_set_errno_and_return_minus_one( EINVAL ); +#endif case OBJECTS_LOCAL: the_core_mq = &the_mq_fd->Queue->Message_queue; diff --git a/cpukit/posix/src/mutexdestroy.c b/cpukit/posix/src/mutexdestroy.c index feffb9cad6..1f3726937d 100644 --- a/cpukit/posix/src/mutexdestroy.c +++ b/cpukit/posix/src/mutexdestroy.c @@ -33,8 +33,8 @@ int pthread_mutex_destroy( the_mutex = _POSIX_Mutex_Get( mutex, &location ); switch ( location ) { - case OBJECTS_REMOTE: #if defined(RTEMS_MULTIPROCESSING) + case OBJECTS_REMOTE: _Thread_Dispatch(); return POSIX_MP_NOT_IMPLEMENTED(); return EINVAL; diff --git a/cpukit/posix/src/mutexgetprioceiling.c b/cpukit/posix/src/mutexgetprioceiling.c index b7bab0c132..7b56d631ec 100644 --- a/cpukit/posix/src/mutexgetprioceiling.c +++ b/cpukit/posix/src/mutexgetprioceiling.c @@ -37,8 +37,8 @@ int pthread_mutex_getprioceiling( the_mutex = _POSIX_Mutex_Get( mutex, &location ); switch ( location ) { - case OBJECTS_REMOTE: #if defined(RTEMS_MULTIPROCESSING) + case OBJECTS_REMOTE: return POSIX_MP_NOT_IMPLEMENTED(); /* XXX feels questionable */ #endif case OBJECTS_ERROR: diff --git a/cpukit/posix/src/mutexinit.c b/cpukit/posix/src/mutexinit.c index 3af8c1d621..753bdc65eb 100644 --- a/cpukit/posix/src/mutexinit.c +++ b/cpukit/posix/src/mutexinit.c @@ -80,7 +80,9 @@ int pthread_mutex_init( mutex_in_use = _POSIX_Mutex_Get( mutex, &location ); switch ( location ) { +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif case OBJECTS_ERROR: break; case OBJECTS_LOCAL: diff --git a/cpukit/posix/src/mutexlocksupp.c b/cpukit/posix/src/mutexlocksupp.c index 13c56d0a06..5b7fb252c9 100644 --- a/cpukit/posix/src/mutexlocksupp.c +++ b/cpukit/posix/src/mutexlocksupp.c @@ -39,8 +39,8 @@ int _POSIX_Mutex_Lock_support( the_mutex = _POSIX_Mutex_Get_interrupt_disable( mutex, &location, &level ); switch ( location ) { - case OBJECTS_REMOTE: #if defined(RTEMS_MULTIPROCESSING) + case OBJECTS_REMOTE: return _POSIX_Mutex_MP_Send_request_packet( POSIX_MUTEX_MP_OBTAIN_REQUEST, *mutex, diff --git a/cpukit/posix/src/mutexsetprioceiling.c b/cpukit/posix/src/mutexsetprioceiling.c index bfbd53d281..8815835443 100644 --- a/cpukit/posix/src/mutexsetprioceiling.c +++ b/cpukit/posix/src/mutexsetprioceiling.c @@ -53,8 +53,8 @@ int pthread_mutex_setprioceiling( the_mutex = _POSIX_Mutex_Get( mutex, &location ); switch ( location ) { - case OBJECTS_REMOTE: #if defined(RTEMS_MULTIPROCESSING) + case OBJECTS_REMOTE: /* XXX It feels questionable to set the ceiling on a remote mutex. */ return EINVAL; #endif diff --git a/cpukit/posix/src/mutexunlock.c b/cpukit/posix/src/mutexunlock.c index 0558e42edb..59faafd254 100644 --- a/cpukit/posix/src/mutexunlock.c +++ b/cpukit/posix/src/mutexunlock.c @@ -36,8 +36,8 @@ int pthread_mutex_unlock( the_mutex = _POSIX_Mutex_Get( mutex, &location ); switch ( location ) { - case OBJECTS_REMOTE: #if defined(RTEMS_MULTIPROCESSING) + case OBJECTS_REMOTE: return _POSIX_Mutex_MP_Send_request_packet( POSIX_MUTEX_MP_RELEASE_REQUEST, *mutex, diff --git a/cpukit/posix/src/pbarrierdestroy.c b/cpukit/posix/src/pbarrierdestroy.c index ed48e78b55..633e4735a4 100644 --- a/cpukit/posix/src/pbarrierdestroy.c +++ b/cpukit/posix/src/pbarrierdestroy.c @@ -1,7 +1,7 @@ /* * POSIX Barrier Manager -- Destroy a Barrier * - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -49,7 +49,9 @@ int pthread_barrier_destroy( the_barrier = _POSIX_Barrier_Get( barrier, &location ); switch ( location ) { +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif case OBJECTS_ERROR: return EINVAL; diff --git a/cpukit/posix/src/pbarrierwait.c b/cpukit/posix/src/pbarrierwait.c index 8856274fe6..7bc7f23a32 100644 --- a/cpukit/posix/src/pbarrierwait.c +++ b/cpukit/posix/src/pbarrierwait.c @@ -1,7 +1,7 @@ /* * POSIX Barrier Manager -- Wait at a Barrier * - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -47,7 +47,9 @@ int pthread_barrier_wait( the_barrier = _POSIX_Barrier_Get( barrier, &location ); switch ( location ) { +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif case OBJECTS_ERROR: return EINVAL; diff --git a/cpukit/posix/src/prwlockdestroy.c b/cpukit/posix/src/prwlockdestroy.c index 6ba858d1d9..67dac7571a 100644 --- a/cpukit/posix/src/prwlockdestroy.c +++ b/cpukit/posix/src/prwlockdestroy.c @@ -1,7 +1,7 @@ /* * POSIX RWLock Manager -- Destroy a RWLock * - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -49,7 +49,9 @@ int pthread_rwlock_destroy( the_rwlock = _POSIX_RWLock_Get( rwlock, &location ); switch ( location ) { +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif case OBJECTS_ERROR: return EINVAL; diff --git a/cpukit/posix/src/prwlockrdlock.c b/cpukit/posix/src/prwlockrdlock.c index adc5130181..ac6473c098 100644 --- a/cpukit/posix/src/prwlockrdlock.c +++ b/cpukit/posix/src/prwlockrdlock.c @@ -1,7 +1,7 @@ /* * POSIX RWLock Manager -- Obtain a Read Lock on a RWLock Instance * - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -47,7 +47,9 @@ int pthread_rwlock_rdlock( the_rwlock = _POSIX_RWLock_Get( rwlock, &location ); switch ( location ) { +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif case OBJECTS_ERROR: return EINVAL; diff --git a/cpukit/posix/src/prwlocktimedrdlock.c b/cpukit/posix/src/prwlocktimedrdlock.c index 2e9d578018..521a3fb33c 100644 --- a/cpukit/posix/src/prwlocktimedrdlock.c +++ b/cpukit/posix/src/prwlocktimedrdlock.c @@ -1,7 +1,7 @@ /* * POSIX RWLock Manager -- Attempt to Obtain a Read Lock on a RWLock Instance * - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -55,7 +55,9 @@ int pthread_rwlock_timedrdlock( the_rwlock = _POSIX_RWLock_Get( rwlock, &location ); switch ( location ) { +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif case OBJECTS_ERROR: return EINVAL; diff --git a/cpukit/posix/src/prwlocktimedwrlock.c b/cpukit/posix/src/prwlocktimedwrlock.c index 5a5253ad02..7d37f2c412 100644 --- a/cpukit/posix/src/prwlocktimedwrlock.c +++ b/cpukit/posix/src/prwlocktimedwrlock.c @@ -1,7 +1,7 @@ /* * POSIX RWLock Manager -- Attempt to Obtain a Write Lock on a RWLock Instance * - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -55,7 +55,9 @@ int pthread_rwlock_timedwrlock( the_rwlock = _POSIX_RWLock_Get( rwlock, &location ); switch ( location ) { +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif case OBJECTS_ERROR: return EINVAL; diff --git a/cpukit/posix/src/prwlocktryrdlock.c b/cpukit/posix/src/prwlocktryrdlock.c index 9d988dd7f2..d6faa9789c 100644 --- a/cpukit/posix/src/prwlocktryrdlock.c +++ b/cpukit/posix/src/prwlocktryrdlock.c @@ -1,7 +1,7 @@ /* * POSIX RWLock Manager -- Attempt to Obtain a Read Lock on a RWLock Instance * - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -47,7 +47,9 @@ int pthread_rwlock_tryrdlock( the_rwlock = _POSIX_RWLock_Get( rwlock, &location ); switch ( location ) { +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif case OBJECTS_ERROR: return EINVAL; diff --git a/cpukit/posix/src/prwlocktrywrlock.c b/cpukit/posix/src/prwlocktrywrlock.c index 861a448447..c6f3104457 100644 --- a/cpukit/posix/src/prwlocktrywrlock.c +++ b/cpukit/posix/src/prwlocktrywrlock.c @@ -1,7 +1,7 @@ /* * POSIX RWLock Manager -- Attempt to Obtain a Write Lock on a RWLock Instance * - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -47,7 +47,9 @@ int pthread_rwlock_trywrlock( the_rwlock = _POSIX_RWLock_Get( rwlock, &location ); switch ( location ) { +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif case OBJECTS_ERROR: return EINVAL; diff --git a/cpukit/posix/src/prwlockunlock.c b/cpukit/posix/src/prwlockunlock.c index a91a0b1291..2854b7c4ba 100644 --- a/cpukit/posix/src/prwlockunlock.c +++ b/cpukit/posix/src/prwlockunlock.c @@ -1,7 +1,7 @@ /* * POSIX RWLock Manager -- Release a lock held on a RWLock Instance * - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -48,7 +48,9 @@ int pthread_rwlock_unlock( the_rwlock = _POSIX_RWLock_Get( rwlock, &location ); switch ( location ) { +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif case OBJECTS_ERROR: return EINVAL; diff --git a/cpukit/posix/src/prwlockwrlock.c b/cpukit/posix/src/prwlockwrlock.c index dfacd90a30..6539e617a1 100644 --- a/cpukit/posix/src/prwlockwrlock.c +++ b/cpukit/posix/src/prwlockwrlock.c @@ -1,7 +1,7 @@ /* * POSIX RWLock Manager -- Obtain a Write Lock on a RWLock Instance * - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -47,7 +47,9 @@ int pthread_rwlock_wrlock( the_rwlock = _POSIX_RWLock_Get( rwlock, &location ); switch ( location ) { +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif case OBJECTS_ERROR: return EINVAL; diff --git a/cpukit/posix/src/pspindestroy.c b/cpukit/posix/src/pspindestroy.c index fb5d8cc738..2a0f54b511 100644 --- a/cpukit/posix/src/pspindestroy.c +++ b/cpukit/posix/src/pspindestroy.c @@ -1,7 +1,7 @@ /* * POSIX Spinlock Manager -- Destroy a Spinlock * - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -49,7 +49,9 @@ int pthread_spin_destroy( the_spinlock = _POSIX_Spinlock_Get( spinlock, &location ); switch ( location ) { +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif case OBJECTS_ERROR: return EINVAL; diff --git a/cpukit/posix/src/pspinlock.c b/cpukit/posix/src/pspinlock.c index 9888b43c32..56f2ce861d 100644 --- a/cpukit/posix/src/pspinlock.c +++ b/cpukit/posix/src/pspinlock.c @@ -1,7 +1,7 @@ /* * POSIX Spinlock Manager -- Wait at a Spinlock * - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -47,7 +47,9 @@ int pthread_spin_lock( the_spinlock = _POSIX_Spinlock_Get( spinlock, &location ); switch ( location ) { +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif case OBJECTS_ERROR: return EINVAL; diff --git a/cpukit/posix/src/pspintrylock.c b/cpukit/posix/src/pspintrylock.c index a77b0e2b21..86c490f1cf 100644 --- a/cpukit/posix/src/pspintrylock.c +++ b/cpukit/posix/src/pspintrylock.c @@ -1,7 +1,7 @@ /* * POSIX Spinlock Manager -- Wait at a Spinlock * - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -47,7 +47,9 @@ int pthread_spin_trylock( the_spinlock = _POSIX_Spinlock_Get( spinlock, &location ); switch ( location ) { +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif case OBJECTS_ERROR: return EINVAL; diff --git a/cpukit/posix/src/pspinunlock.c b/cpukit/posix/src/pspinunlock.c index 0af28ce56d..38f6310a79 100644 --- a/cpukit/posix/src/pspinunlock.c +++ b/cpukit/posix/src/pspinunlock.c @@ -1,7 +1,7 @@ /* * POSIX Spinlock Manager -- Wait at a Spinlock * - * COPYRIGHT (c) 1989-2006. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -47,7 +47,9 @@ int pthread_spin_unlock( the_spinlock = _POSIX_Spinlock_Get( spinlock, &location ); switch ( location ) { +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif case OBJECTS_ERROR: return EINVAL; diff --git a/cpukit/posix/src/pthreaddetach.c b/cpukit/posix/src/pthreaddetach.c index 7d7629f18a..153f04dba0 100644 --- a/cpukit/posix/src/pthreaddetach.c +++ b/cpukit/posix/src/pthreaddetach.c @@ -1,7 +1,7 @@ /* * 16.1.4 Detaching a Thread, P1003.1c/Draft 10, p. 149 * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -32,8 +32,10 @@ int pthread_detach( the_thread = _POSIX_Threads_Get( thread, &location ); switch ( location ) { - case OBJECTS_ERROR: +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif + case OBJECTS_ERROR: return ESRCH; case OBJECTS_LOCAL: diff --git a/cpukit/posix/src/pthreadequal.c b/cpukit/posix/src/pthreadequal.c index 2b15761886..86db43767a 100644 --- a/cpukit/posix/src/pthreadequal.c +++ b/cpukit/posix/src/pthreadequal.c @@ -53,8 +53,10 @@ int pthread_equal( (void) _POSIX_Threads_Get( t1, &location ); switch ( location ) { - case OBJECTS_ERROR: +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif + case OBJECTS_ERROR: /* return status == 0 */ break; diff --git a/cpukit/posix/src/pthreadgetschedparam.c b/cpukit/posix/src/pthreadgetschedparam.c index 8b399b75ba..ff92fe29d5 100644 --- a/cpukit/posix/src/pthreadgetschedparam.c +++ b/cpukit/posix/src/pthreadgetschedparam.c @@ -2,7 +2,7 @@ * 13.5.2 Dynamic Thread Scheduling Parameters Access, * P1003.1c/Draft 10, p. 124 * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -38,8 +38,10 @@ int pthread_getschedparam( the_thread = _POSIX_Threads_Get( thread, &location ); switch ( location ) { - case OBJECTS_ERROR: +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif + case OBJECTS_ERROR: return ESRCH; case OBJECTS_LOCAL: api = the_thread->API_Extensions[ THREAD_API_POSIX ]; diff --git a/cpukit/posix/src/pthreadjoin.c b/cpukit/posix/src/pthreadjoin.c index 669028335c..7c2623f81d 100644 --- a/cpukit/posix/src/pthreadjoin.c +++ b/cpukit/posix/src/pthreadjoin.c @@ -1,7 +1,7 @@ /* * 16.1.3 Wait for Thread Termination, P1003.1c/Draft 10, p. 147 * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -34,8 +34,10 @@ int pthread_join( the_thread = _POSIX_Threads_Get( thread, &location ); switch ( location ) { - case OBJECTS_ERROR: +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif + case OBJECTS_ERROR: return ESRCH; case OBJECTS_LOCAL: api = the_thread->API_Extensions[ THREAD_API_POSIX ]; diff --git a/cpukit/posix/src/pthreadkill.c b/cpukit/posix/src/pthreadkill.c index c6624eb8be..be3678db14 100644 --- a/cpukit/posix/src/pthreadkill.c +++ b/cpukit/posix/src/pthreadkill.c @@ -1,7 +1,7 @@ /* * 3.3.10 Send a Signal to a Thread, P1003.1c/D10, p. 43 * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -47,8 +47,10 @@ int pthread_kill( the_thread = _POSIX_Threads_Get( thread, &location ); switch ( location ) { - case OBJECTS_ERROR: +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif + case OBJECTS_ERROR: rtems_set_errno_and_return_minus_one( ESRCH ); case OBJECTS_LOCAL: /* diff --git a/cpukit/posix/src/pthreadsetschedparam.c b/cpukit/posix/src/pthreadsetschedparam.c index 63b45f8669..5b3e852541 100644 --- a/cpukit/posix/src/pthreadsetschedparam.c +++ b/cpukit/posix/src/pthreadsetschedparam.c @@ -86,8 +86,10 @@ int pthread_setschedparam( the_thread = _POSIX_Threads_Get( thread, &location ); switch ( location ) { - case OBJECTS_ERROR: +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif + case OBJECTS_ERROR: return ESRCH; case OBJECTS_LOCAL: api = the_thread->API_Extensions[ THREAD_API_POSIX ]; diff --git a/cpukit/posix/src/ptimer1.c b/cpukit/posix/src/ptimer1.c index 2ee201ddda..142ac846c9 100644 --- a/cpukit/posix/src/ptimer1.c +++ b/cpukit/posix/src/ptimer1.c @@ -228,8 +228,8 @@ int timer_delete( ptimer = _POSIX_Timer_Get( timerid, &location ); switch ( location ) { - case OBJECTS_REMOTE: #if defined(RTEMS_MULTIPROCESSING) + case OBJECTS_REMOTE: _Thread_Dispatch(); rtems_set_errno_and_return_minus_one( EINVAL ); #endif @@ -292,8 +292,8 @@ int timer_settime( ptimer = _POSIX_Timer_Get( timerid, &location ); switch ( location ) { - case OBJECTS_REMOTE: #if defined(RTEMS_MULTIPROCESSING) + case OBJECTS_REMOTE: _Thread_Dispatch(); return -1; rtems_set_errno_and_return_minus_one( EINVAL ); @@ -416,8 +416,8 @@ int timer_gettime( ptimer = _POSIX_Timer_Get( timerid, &location ); switch ( location ) { - case OBJECTS_REMOTE: #if defined(RTEMS_MULTIPROCESSING) + case OBJECTS_REMOTE: _Thread_Dispatch(); rtems_set_errno_and_return_minus_one( EINVAL ); #endif @@ -465,8 +465,8 @@ int timer_getoverrun( ptimer = _POSIX_Timer_Get( timerid, &location ); switch ( location ) { - case OBJECTS_REMOTE: #if defined(RTEMS_MULTIPROCESSING) + case OBJECTS_REMOTE: _Thread_Dispatch(); rtems_set_errno_and_return_minus_one( EINVAL ); #endif diff --git a/cpukit/posix/src/semaphorewaitsupp.c b/cpukit/posix/src/semaphorewaitsupp.c index 1c5f815b25..c815e42500 100644 --- a/cpukit/posix/src/semaphorewaitsupp.c +++ b/cpukit/posix/src/semaphorewaitsupp.c @@ -38,9 +38,11 @@ int _POSIX_Semaphore_Wait_support( switch ( location ) { case OBJECTS_ERROR: rtems_set_errno_and_return_minus_one( EINVAL ); +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: _Thread_Dispatch(); rtems_set_errno_and_return_minus_one( EINVAL ); +#endif case OBJECTS_LOCAL: _CORE_semaphore_Seize( &the_semaphore->Semaphore, diff --git a/cpukit/posix/src/semclose.c b/cpukit/posix/src/semclose.c index 83b72f36e0..007caacdc2 100644 --- a/cpukit/posix/src/semclose.c +++ b/cpukit/posix/src/semclose.c @@ -41,10 +41,12 @@ int sem_close( switch ( location ) { case OBJECTS_ERROR: rtems_set_errno_and_return_minus_one( EINVAL ); +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: _Thread_Dispatch(); return POSIX_MP_NOT_IMPLEMENTED(); rtems_set_errno_and_return_minus_one( EINVAL ); +#endif case OBJECTS_LOCAL: the_semaphore->open_count -= 1; _POSIX_Semaphore_Delete( the_semaphore ); diff --git a/cpukit/posix/src/semdestroy.c b/cpukit/posix/src/semdestroy.c index 2daccce17c..75b74c6763 100644 --- a/cpukit/posix/src/semdestroy.c +++ b/cpukit/posix/src/semdestroy.c @@ -36,10 +36,12 @@ int sem_destroy( switch ( location ) { case OBJECTS_ERROR: rtems_set_errno_and_return_minus_one( EINVAL ); +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: _Thread_Dispatch(); return POSIX_MP_NOT_IMPLEMENTED(); rtems_set_errno_and_return_minus_one( EINVAL ); +#endif case OBJECTS_LOCAL: /* * Undefined operation on a named semaphore. diff --git a/cpukit/posix/src/semgetvalue.c b/cpukit/posix/src/semgetvalue.c index e2bf9f83b2..c8c3222443 100644 --- a/cpukit/posix/src/semgetvalue.c +++ b/cpukit/posix/src/semgetvalue.c @@ -37,10 +37,12 @@ int sem_getvalue( switch ( location ) { case OBJECTS_ERROR: rtems_set_errno_and_return_minus_one( EINVAL ); +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: _Thread_Dispatch(); return POSIX_MP_NOT_IMPLEMENTED(); rtems_set_errno_and_return_minus_one( EINVAL ); +#endif case OBJECTS_LOCAL: *sval = _CORE_semaphore_Get_count( &the_semaphore->Semaphore ); _Thread_Enable_dispatch(); diff --git a/cpukit/posix/src/sempost.c b/cpukit/posix/src/sempost.c index a4d7a36876..5381ea4800 100644 --- a/cpukit/posix/src/sempost.c +++ b/cpukit/posix/src/sempost.c @@ -36,10 +36,12 @@ int sem_post( switch ( location ) { case OBJECTS_ERROR: rtems_set_errno_and_return_minus_one( EINVAL ); +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: _Thread_Dispatch(); return POSIX_MP_NOT_IMPLEMENTED(); rtems_set_errno_and_return_minus_one( EINVAL ); +#endif case OBJECTS_LOCAL: _CORE_semaphore_Surrender( &the_semaphore->Semaphore, diff --git a/cpukit/posix/src/types.c b/cpukit/posix/src/types.c index d9befea289..7f951f6154 100644 --- a/cpukit/posix/src/types.c +++ b/cpukit/posix/src/types.c @@ -23,11 +23,13 @@ #include <assert.h> +#if defined(RTEMS_MULTIPROCESSING) int POSIX_MP_NOT_IMPLEMENTED() { assert( 0 ); return 0; } +#endif int POSIX_BOTTOM_REACHED() { |