diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-12-14 16:31:44 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-02-03 10:00:55 +0100 |
| commit | 9871f5dc60c622b58710f624f2ddb9328de16eb8 (patch) | |
| tree | 7634755c127f37744dfeafd62ce2fc7368adaf70 /cpukit/posix | |
| parent | Optional POSIX Condition Variable initialization (diff) | |
| download | rtems-9871f5dc60c622b58710f624f2ddb9328de16eb8.tar.bz2 | |
Optional POSIX Mutex initialization
Update #2408.
Diffstat (limited to 'cpukit/posix')
| -rw-r--r-- | cpukit/posix/include/rtems/posix/muteximpl.h | 11 | ||||
| -rw-r--r-- | cpukit/posix/src/mutex.c | 13 |
2 files changed, 14 insertions, 10 deletions
diff --git a/cpukit/posix/include/rtems/posix/muteximpl.h b/cpukit/posix/include/rtems/posix/muteximpl.h index f4c6c686aa..c1fab0c977 100644 --- a/cpukit/posix/include/rtems/posix/muteximpl.h +++ b/cpukit/posix/include/rtems/posix/muteximpl.h @@ -31,12 +31,12 @@ extern "C" { * The following defines the information control block used to manage * this class of objects. */ -POSIX_EXTERN Objects_Information _POSIX_Mutex_Information; +extern Objects_Information _POSIX_Mutex_Information; /** * The default mutex attributes structure. */ -POSIX_EXTERN pthread_mutexattr_t _POSIX_Mutex_Default_attributes; +extern pthread_mutexattr_t _POSIX_Mutex_Default_attributes; /** * This array contains a mapping from Score Mutex return codes to @@ -45,13 +45,6 @@ POSIX_EXTERN pthread_mutexattr_t _POSIX_Mutex_Default_attributes; extern const int _POSIX_Mutex_Return_codes[CORE_MUTEX_STATUS_LAST + 1]; /** - * @brief POSIX Mutex Manager Initialization - * - * This routine performs the initialization necessary for this manager. - */ -void _POSIX_Mutex_Manager_initialization(void); - -/** * @brief POSIX Mutex Allocate * * This function allocates a mutexes control block from diff --git a/cpukit/posix/src/mutex.c b/cpukit/posix/src/mutex.c index 89e5b84951..ef56d0a6b2 100644 --- a/cpukit/posix/src/mutex.c +++ b/cpukit/posix/src/mutex.c @@ -24,11 +24,16 @@ #include <rtems/system.h> #include <rtems/config.h> +#include <rtems/sysinit.h> #include <rtems/score/coremuteximpl.h> #include <rtems/score/watchdog.h> #include <rtems/posix/muteximpl.h> #include <rtems/posix/priorityimpl.h> +Objects_Information _POSIX_Mutex_Information; + +pthread_mutexattr_t _POSIX_Mutex_Default_attributes; + /* * _POSIX_Mutex_Manager_initialization * @@ -40,7 +45,7 @@ * Output parameters: NONE */ -void _POSIX_Mutex_Manager_initialization(void) +static void _POSIX_Mutex_Manager_initialization(void) { pthread_mutexattr_t *default_attr = &_POSIX_Mutex_Default_attributes; @@ -77,3 +82,9 @@ void _POSIX_Mutex_Manager_initialization(void) #endif ); } + +RTEMS_SYSINIT_ITEM( + _POSIX_Mutex_Manager_initialization, + RTEMS_SYSINIT_POSIX_MUTEX, + RTEMS_SYSINIT_ORDER_MIDDLE +); |