RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

posix: Use interal mutex for once implementation

Browse Source 
Enable pthread_once() for all configurations.  The pthread_once()
function is one means to initialize POSIX keys.  Another use case is the
C++ support.
This commit is contained in:
Sebastian Huber
2014-03-18 08:28:14 +01:00
parent fa3993d92d
commit 51f823c932
10 changed files with 43 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cpukit/sapi/include/confdefs.h
View File

@@ -1765,11 +1765,6 @@ const rtems_libio_helper rtems_fs_init_helper =
#include <rtems/posix/threadsup.h>
#include <rtems/posix/timer.h>
/**
* POSIX Once support uses a single mutex.
*/
#define CONFIGURE_MAXIMUM_POSIX_INTERNAL_MUTEXES 1
/**
* Account for the object control structures plus the name
* of the object to be duplicated.
@@ -1899,7 +1894,6 @@ const rtems_libio_helper rtems_fs_init_helper =
#define CONFIGURE_MEMORY_FOR_POSIX \
( CONFIGURE_MEMORY_FOR_POSIX_MUTEXES( CONFIGURE_MAXIMUM_POSIX_MUTEXES + \
CONFIGURE_MAXIMUM_POSIX_INTERNAL_MUTEXES + \
CONFIGURE_MAXIMUM_GO_CHANNELS + CONFIGURE_GO_INIT_MUTEXES) + \
CONFIGURE_MEMORY_FOR_POSIX_CONDITION_VARIABLES( \
CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES + \
@@ -2130,11 +2124,11 @@ const rtems_libio_helper rtems_fs_init_helper =
#endif
/**
* RTEMS uses one instance of an internal mutex class. This accounts
* for that mutex
* RTEMS uses two instance of an internal mutex class. This accounts
* for these mutexes.
*/
#define CONFIGURE_API_MUTEX_MEMORY \
_Configure_Object_RAM(1, sizeof(API_Mutex_Control))
_Configure_Object_RAM(2, sizeof(API_Mutex_Control))
/**
* This calculates the amount of memory reserved for the IDLE tasks.
@@ -2349,7 +2343,6 @@ const rtems_libio_helper rtems_fs_init_helper =
CONFIGURE_MAXIMUM_POSIX_THREADS + CONFIGURE_MAXIMUM_ADA_TASKS +
CONFIGURE_MAXIMUM_GOROUTINES,
CONFIGURE_MAXIMUM_POSIX_MUTEXES + CONFIGURE_GNAT_MUTEXES +
CONFIGURE_MAXIMUM_POSIX_INTERNAL_MUTEXES +
CONFIGURE_MAXIMUM_ADA_TASKS + CONFIGURE_MAXIMUM_FAKE_ADA_TASKS +
CONFIGURE_GO_INIT_MUTEXES + CONFIGURE_MAXIMUM_GO_CHANNELS,
CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES +
@@ -2599,7 +2592,6 @@ const rtems_libio_helper rtems_fs_init_helper =
#ifdef RTEMS_POSIX_API
/* POSIX API Pieces */
CONFIGURE_MEMORY_FOR_POSIX_MUTEXES( CONFIGURE_MAXIMUM_POSIX_MUTEXES +
CONFIGURE_MAXIMUM_POSIX_INTERNAL_MUTEXES +
CONFIGURE_MAXIMUM_GO_CHANNELS + CONFIGURE_GO_INIT_MUTEXES),
CONFIGURE_MEMORY_FOR_POSIX_CONDITION_VARIABLES(
CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES +

3
cpukit/sapi/src/exinit.c
View File

@@ -116,8 +116,9 @@ void rtems_initialize_data_structures(void)
*/
_Objects_Information_table[OBJECTS_INTERNAL_API] = _Internal_Objects;
_API_Mutex_Initialization( 1 );
_API_Mutex_Initialization( 2 );
_API_Mutex_Allocate( &_RTEMS_Allocator_Mutex );
_API_Mutex_Allocate( &_Once_Mutex );
_Watchdog_Handler_initialization();
_TOD_Handler_initialization();

2
cpukit/sapi/src/posixapi.c
View File

@@ -36,7 +36,6 @@
#include <rtems/posix/condimpl.h>
#include <rtems/posix/mqueueimpl.h>
#include <rtems/posix/muteximpl.h>
#include <rtems/posix/onceimpl.h>
#include <rtems/posix/priorityimpl.h>
#include <rtems/posix/psignalimpl.h>
#include <rtems/posix/pthreadimpl.h>
@@ -79,7 +78,6 @@ void _POSIX_API_Initialize(void)
_POSIX_Condition_variables_Manager_initialization();
_POSIX_Mutex_Manager_initialization();
_POSIX_Message_queue_Manager_initialization();
_POSIX_Once_Manager_initialization();
_POSIX_Semaphore_Manager_initialization();
_POSIX_Timer_Manager_initialization();
_POSIX_Barrier_Manager_initialization();