diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-03 22:23:13 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-03 22:23:13 +0000 |
commit | 976162a69f6fdfbd2ab507074be7d99a48b4f7f7 (patch) | |
tree | 375dac0660e6845642167a2cba304a6812a33d26 /cpukit/posix | |
parent | 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-976162a69f6fdfbd2ab507074be7d99a48b4f7f7.tar.bz2 |
2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com>
* libcsupport/src/malloc.c, libmisc/monitor/mon-command.c,
posix/preinstall.am, posix/include/rtems/posix/cond.h,
posix/include/rtems/posix/mqueue.h,
posix/include/rtems/posix/mutex.h,
posix/include/rtems/posix/pthread.h,
posix/include/rtems/posix/semaphore.h, posix/src/conddestroy.c,
posix/src/mutexdestroy.c, posix/src/mutexinit.c,
posix/src/mutexsetprioceiling.c, posix/src/mutexunlock.c,
sapi/include/confdefs.h, sapi/include/rtems/config.h,
sapi/include/rtems/init.h, sapi/include/rtems/sptables.h,
sapi/src/exinit.c, score/include/rtems/system.h,
score/include/rtems/score/mpci.h, score/src/mpci.c,
score/src/thread.c, score/src/threadcreateidle.c,
score/src/threadstackallocate.c, score/src/threadstackfree.c,
score/src/wkspace.c: Moved most of the remaining CPU Table fields to
the Configuration Table. This included pretasking_hook,
predriver_hook, postdriver_hook, idle_task, do_zero_of_workspace,
extra_mpci_receive_server_stack, stack_allocate_hook, and
stack_free_hook. As a side-effect of this effort some multiprocessing
code was made conditional and some style clean up occurred.
Diffstat (limited to '')
-rw-r--r-- | cpukit/posix/include/rtems/posix/cond.h | 3 | ||||
-rw-r--r-- | cpukit/posix/include/rtems/posix/mqueue.h | 3 | ||||
-rw-r--r-- | cpukit/posix/include/rtems/posix/mutex.h | 3 | ||||
-rw-r--r-- | cpukit/posix/include/rtems/posix/pthread.h | 3 | ||||
-rw-r--r-- | cpukit/posix/include/rtems/posix/semaphore.h | 3 | ||||
-rw-r--r-- | cpukit/posix/preinstall.am | 16 | ||||
-rw-r--r-- | cpukit/posix/src/conddestroy.c | 17 | ||||
-rw-r--r-- | cpukit/posix/src/mutexdestroy.c | 27 | ||||
-rw-r--r-- | cpukit/posix/src/mutexinit.c | 23 | ||||
-rw-r--r-- | cpukit/posix/src/mutexsetprioceiling.c | 7 | ||||
-rw-r--r-- | cpukit/posix/src/mutexunlock.c | 4 |
11 files changed, 16 insertions, 93 deletions
diff --git a/cpukit/posix/include/rtems/posix/cond.h b/cpukit/posix/include/rtems/posix/cond.h index 23b00d9dba..a692ad462f 100644 --- a/cpukit/posix/include/rtems/posix/cond.h +++ b/cpukit/posix/include/rtems/posix/cond.h @@ -159,9 +159,6 @@ int _POSIX_Condition_variables_Wait_support( ); #include <rtems/posix/cond.inl> -#if defined(RTEMS_MULTIPROCESSING) -#include <rtems/posix/condmp.h> -#endif #ifdef __cplusplus } diff --git a/cpukit/posix/include/rtems/posix/mqueue.h b/cpukit/posix/include/rtems/posix/mqueue.h index 7b831ac141..475f9a2432 100644 --- a/cpukit/posix/include/rtems/posix/mqueue.h +++ b/cpukit/posix/include/rtems/posix/mqueue.h @@ -239,9 +239,6 @@ int _POSIX_Message_queue_Translate_core_message_queue_return_code( #include <rtems/posix/mqueue.inl> -#if defined(RTEMS_MULTIPROCESSING) -#include <rtems/posix/mqueuemp.h> -#endif #ifdef __cplusplus } diff --git a/cpukit/posix/include/rtems/posix/mutex.h b/cpukit/posix/include/rtems/posix/mutex.h index 0d61041a83..72551a78fc 100644 --- a/cpukit/posix/include/rtems/posix/mutex.h +++ b/cpukit/posix/include/rtems/posix/mutex.h @@ -148,9 +148,6 @@ int _POSIX_Mutex_Translate_core_mutex_return_code( #include <rtems/posix/mutex.inl> -#if defined(RTEMS_MULTIPROCESSING) -#include <rtems/posix/mutexmp.h> -#endif #ifdef __cplusplus } diff --git a/cpukit/posix/include/rtems/posix/pthread.h b/cpukit/posix/include/rtems/posix/pthread.h index 1598abc56d..6d0c739f0c 100644 --- a/cpukit/posix/include/rtems/posix/pthread.h +++ b/cpukit/posix/include/rtems/posix/pthread.h @@ -141,9 +141,6 @@ void _POSIX_Threads_Sporadic_budget_TSR( ); #include <rtems/posix/pthread.inl> -#if defined(RTEMS_MULTIPROCESSING) -#include <rtems/posix/pthreadmp.h> -#endif #ifdef __cplusplus } diff --git a/cpukit/posix/include/rtems/posix/semaphore.h b/cpukit/posix/include/rtems/posix/semaphore.h index 6a1645eee0..804a8bd0e3 100644 --- a/cpukit/posix/include/rtems/posix/semaphore.h +++ b/cpukit/posix/include/rtems/posix/semaphore.h @@ -185,9 +185,6 @@ int _POSIX_Semaphore_Translate_core_semaphore_return_code( ); #include <rtems/posix/semaphore.inl> -#if defined(RTEMS_MULTIPROCESSING) -#include <rtems/posix/semaphoremp.h> -#endif #ifdef __cplusplus } diff --git a/cpukit/posix/preinstall.am b/cpukit/posix/preinstall.am index 5531e7c852..aeaf59f589 100644 --- a/cpukit/posix/preinstall.am +++ b/cpukit/posix/preinstall.am @@ -8,10 +8,20 @@ endif PREINSTALL_DIRS = DISTCLEANFILES = $(PREINSTALL_DIRS) +all-local: $(TMPINSTALL_FILES) + +TMPINSTALL_FILES = +CLEANFILES = $(TMPINSTALL_FILES) + all-am: $(PREINSTALL_FILES) PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) +CLEANFILES += $(PREINSTALL_FILES) + +$(PROJECT_LIB)/$(dirstamp): + @$(MKDIR_P) $(PROJECT_LIB) + @: > $(PROJECT_LIB)/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) $(PROJECT_INCLUDE)/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE) @@ -19,6 +29,10 @@ $(PROJECT_INCLUDE)/$(dirstamp): PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) if LIBPOSIX +$(PROJECT_LIB)/libposix.a: libposix.a $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/libposix.a +TMPINSTALL_FILES += $(PROJECT_LIB)/libposix.a + if HAS_PTHREADS $(PROJECT_INCLUDE)/sched.h: include/sched.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sched.h diff --git a/cpukit/posix/src/conddestroy.c b/cpukit/posix/src/conddestroy.c index ae9cbcde92..7fbc4158cb 100644 --- a/cpukit/posix/src/conddestroy.c +++ b/cpukit/posix/src/conddestroy.c @@ -46,23 +46,6 @@ int pthread_cond_destroy( ); _POSIX_Condition_variables_Free( the_cond ); - -#if defined(RTEMS_MULTIPROCESSING) - if ( the_cond->process_shared == PTHREAD_PROCESS_SHARED ) { - - _Objects_MP_Close( - &_POSIX_Condition_variables_Information, - the_cond->Object.id - ); - - _POSIX_Condition_variables_MP_Send_process_packet( - POSIX_CONDITION_VARIABLES_MP_ANNOUNCE_DELETE, - the_cond->Object.id, - 0, /* Not used */ - 0 /* Not used */ - ); - } -#endif _Thread_Enable_dispatch(); return 0; diff --git a/cpukit/posix/src/mutexdestroy.c b/cpukit/posix/src/mutexdestroy.c index 27ccbd9e3c..f6bcaaa0d5 100644 --- a/cpukit/posix/src/mutexdestroy.c +++ b/cpukit/posix/src/mutexdestroy.c @@ -12,9 +12,6 @@ #include <rtems/system.h> #include <rtems/score/coremutex.h> #include <rtems/score/watchdog.h> -#if defined(RTEMS_MULTIPROCESSING) -#include <rtems/score/mpci.h> -#endif #include <rtems/posix/mutex.h> #include <rtems/posix/priority.h> #include <rtems/posix/time.h> @@ -47,31 +44,9 @@ int pthread_mutex_destroy( _Objects_Close( &_POSIX_Mutex_Information, &the_mutex->Object ); - _CORE_mutex_Flush( - &the_mutex->Mutex, -#if defined(RTEMS_MULTIPROCESSING) - _POSIX_Mutex_MP_Send_object_was_deleted, -#else - NULL, -#endif - EINVAL - ); + _CORE_mutex_Flush( &the_mutex->Mutex, NULL, EINVAL ); _POSIX_Mutex_Free( the_mutex ); - -#if defined(RTEMS_MULTIPROCESSING) - if ( the_mutex->process_shared == PTHREAD_PROCESS_SHARED ) { - - _Objects_MP_Close( &_POSIX_Mutex_Information, the_mutex->Object.id ); - - _POSIX_Mutex_MP_Send_process_packet( - POSIX_MUTEX_MP_ANNOUNCE_DELETE, - the_mutex->Object.id, - 0, /* Not used */ - 0 /* Not used */ - ); - } -#endif _Thread_Enable_dispatch(); return 0; diff --git a/cpukit/posix/src/mutexinit.c b/cpukit/posix/src/mutexinit.c index a743874d42..9751c00179 100644 --- a/cpukit/posix/src/mutexinit.c +++ b/cpukit/posix/src/mutexinit.c @@ -13,9 +13,6 @@ #include <rtems/system.h> #include <rtems/score/coremutex.h> #include <rtems/score/watchdog.h> -#if defined(RTEMS_MULTIPROCESSING) -#include <rtems/score/mpci.h> -#endif #include <rtems/posix/mutex.h> #include <rtems/posix/priority.h> #include <rtems/posix/time.h> @@ -132,16 +129,6 @@ int pthread_mutex_init( return EAGAIN; } -#if defined(RTEMS_MULTIPROCESSING) - if ( the_attr->process_shared == PTHREAD_PROCESS_SHARED && - !( _Objects_MP_Allocate_and_open( &_POSIX_Mutex_Information, 0, - the_mutex->Object.id, FALSE ) ) ) { - _POSIX_Mutex_Free( the_mutex ); - _Thread_Enable_dispatch(); - return EAGAIN; - } -#endif - the_mutex->process_shared = the_attr->process_shared; the_mutex_attr = &the_mutex->Mutex.Attributes; @@ -169,16 +156,6 @@ int pthread_mutex_init( *mutex = the_mutex->Object.id; -#if defined(RTEMS_MULTIPROCESSING) - if ( the_attr->process_shared == PTHREAD_PROCESS_SHARED ) - _POSIX_Mutex_MP_Send_process_packet( - POSIX_MUTEX_MP_ANNOUNCE_CREATE, - the_mutex->Object.id, - 0, /* Name not used */ - 0 /* Not used */ - ); -#endif - _Thread_Enable_dispatch(); return 0; } diff --git a/cpukit/posix/src/mutexsetprioceiling.c b/cpukit/posix/src/mutexsetprioceiling.c index e50c053522..877ae45f70 100644 --- a/cpukit/posix/src/mutexsetprioceiling.c +++ b/cpukit/posix/src/mutexsetprioceiling.c @@ -12,9 +12,6 @@ #include <rtems/system.h> #include <rtems/score/coremutex.h> #include <rtems/score/watchdog.h> -#if defined(RTEMS_MULTIPROCESSING) -#include <rtems/score/mpci.h> -#endif #include <rtems/posix/mutex.h> #include <rtems/posix/priority.h> #include <rtems/posix/time.h> @@ -62,11 +59,7 @@ int pthread_mutex_setprioceiling( _CORE_mutex_Surrender( &the_mutex->Mutex, the_mutex->Object.id, -#if defined(RTEMS_MULTIPROCESSING) - _POSIX_Threads_mutex_MP_support -#else NULL -#endif ); _Thread_Enable_dispatch(); return 0; diff --git a/cpukit/posix/src/mutexunlock.c b/cpukit/posix/src/mutexunlock.c index 2323dee66d..1c38d427b9 100644 --- a/cpukit/posix/src/mutexunlock.c +++ b/cpukit/posix/src/mutexunlock.c @@ -41,11 +41,7 @@ int pthread_mutex_unlock( status = _CORE_mutex_Surrender( &the_mutex->Mutex, the_mutex->Object.id, -#if defined(RTEMS_MULTIPROCESSING) - _POSIX_Threads_mutex_MP_support -#else NULL -#endif ); _Thread_Enable_dispatch(); return _POSIX_Mutex_Translate_core_mutex_return_code( status ); |