From 6b4a3770cd0749bfeb593a8c6213805fb6df65a0 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 19 Jul 2013 10:51:44 +0200 Subject: posix: Create barrier implementation header Move implementation specific parts of barrier.h and barrier.inl into new header file barrierimpl.h. The barrier.h contains now only the application visible API. --- cpukit/posix/Makefile.am | 2 +- cpukit/posix/include/rtems/posix/barrier.h | 51 ++-------- cpukit/posix/include/rtems/posix/barrierimpl.h | 131 +++++++++++++++++++++++++ cpukit/posix/inline/rtems/posix/barrier.inl | 96 ------------------ cpukit/posix/preinstall.am | 8 +- cpukit/posix/src/pbarrier.c | 2 +- cpukit/posix/src/pbarrierdestroy.c | 2 +- cpukit/posix/src/pbarrierinit.c | 2 +- cpukit/posix/src/pbarriertranslatereturncode.c | 2 +- cpukit/posix/src/pbarrierwait.c | 2 +- 10 files changed, 150 insertions(+), 148 deletions(-) create mode 100644 cpukit/posix/include/rtems/posix/barrierimpl.h delete mode 100644 cpukit/posix/inline/rtems/posix/barrier.inl (limited to 'cpukit/posix') diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am index 0accfd4239..a7a4111236 100644 --- a/cpukit/posix/Makefile.am +++ b/cpukit/posix/Makefile.am @@ -45,6 +45,7 @@ include_rtems_posix_HEADERS += include/rtems/posix/threadsup.h include_rtems_posix_HEADERS += include/rtems/posix/time.h include_rtems_posix_HEADERS += include/rtems/posix/timer.h include_rtems_posix_HEADERS += include/rtems/posix/barrier.h +include_rtems_posix_HEADERS += include/rtems/posix/barrierimpl.h include_rtems_posix_HEADERS += include/rtems/posix/rwlock.h include_rtems_posix_HEADERS += include/rtems/posix/spinlock.h @@ -53,7 +54,6 @@ include_rtems_posix_HEADERS += inline/rtems/posix/key.inl include_rtems_posix_HEADERS += inline/rtems/posix/pthread.inl include_rtems_posix_HEADERS += inline/rtems/posix/priority.inl include_rtems_posix_HEADERS += inline/rtems/posix/timer.inl -include_rtems_posix_HEADERS += inline/rtems/posix/barrier.inl include_rtems_posix_HEADERS += inline/rtems/posix/rwlock.inl include_rtems_posix_HEADERS += inline/rtems/posix/spinlock.inl diff --git a/cpukit/posix/include/rtems/posix/barrier.h b/cpukit/posix/include/rtems/posix/barrier.h index 73c63f7162..3ad9bf82d8 100644 --- a/cpukit/posix/include/rtems/posix/barrier.h +++ b/cpukit/posix/include/rtems/posix/barrier.h @@ -25,6 +25,13 @@ #ifndef _RTEMS_POSIX_BARRIER_H #define _RTEMS_POSIX_BARRIER_H +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + /** * @defgroup POSIXBarrier POSIX Barriers * @@ -36,13 +43,6 @@ */ /**@{**/ -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include - /** * This type defines the control block used to manage each barrier. */ @@ -54,44 +54,11 @@ typedef struct { CORE_barrier_Control Barrier; } POSIX_Barrier_Control; -/** - * The following defines the information control block used to manage - * this class of objects. - */ - -POSIX_EXTERN Objects_Information _POSIX_Barrier_Information; - -/** - * @brief POSIX barrier manager initialization. - * - * This routine performs the initialization necessary for this manager. - */ - -void _POSIX_Barrier_Manager_initialization(void); - -/** - * @brief POSIX translate barrier return code. - * - * This routine translates SuperCore Barrier status codes into the - * corresponding POSIX ones. - * - * @param[in] the_barrier_status is the SuperCore status. - * - * @return the corresponding POSIX status - */ -int _POSIX_Barrier_Translate_core_barrier_return_code( - CORE_barrier_Status the_barrier_status -); - -#ifndef __RTEMS_APPLICATION__ -#include -#endif - -/** @} */ - #ifdef __cplusplus } #endif +/** @} */ + #endif /* end of include file */ diff --git a/cpukit/posix/include/rtems/posix/barrierimpl.h b/cpukit/posix/include/rtems/posix/barrierimpl.h new file mode 100644 index 0000000000..180c169c6d --- /dev/null +++ b/cpukit/posix/include/rtems/posix/barrierimpl.h @@ -0,0 +1,131 @@ +/** + * @file + * + * @brief Inlined Routines from the POSIX Barrier Manager + * + * This file contains the static inlin implementation of the inlined + * routines from the POSIX Barrier Manager. + */ + +/* + * COPYRIGHT (c) 1989-2011. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + */ + +#ifndef _RTEMS_POSIX_BARRIERIMPL_H +#define _RTEMS_POSIX_BARRIERIMPL_H + +#include + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * The following defines the information control block used to manage + * this class of objects. + */ + +POSIX_EXTERN Objects_Information _POSIX_Barrier_Information; + +/** + * @brief POSIX barrier manager initialization. + * + * This routine performs the initialization necessary for this manager. + */ + +void _POSIX_Barrier_Manager_initialization(void); + +/** + * @brief POSIX translate barrier return code. + * + * This routine translates SuperCore Barrier status codes into the + * corresponding POSIX ones. + * + * @param[in] the_barrier_status is the SuperCore status. + * + * @return the corresponding POSIX status + */ +int _POSIX_Barrier_Translate_core_barrier_return_code( + CORE_barrier_Status the_barrier_status +); + +/** + * @brief Allocate a barrier control block. + * + * This function allocates a barrier control block from + * the inactive chain of free barrier control blocks. + */ +RTEMS_INLINE_ROUTINE POSIX_Barrier_Control *_POSIX_Barrier_Allocate( void ) +{ + return (POSIX_Barrier_Control *) + _Objects_Allocate( &_POSIX_Barrier_Information ); +} + +/** + * @brief Free a barrier control block. + * + * This routine frees a barrier control block to the + * inactive chain of free barrier control blocks. + */ +RTEMS_INLINE_ROUTINE void _POSIX_Barrier_Free ( + POSIX_Barrier_Control *the_barrier +) +{ + _Objects_Free( &_POSIX_Barrier_Information, &the_barrier->Object ); +} + +/** + * @brief Get a barrier control block. + * + * This function maps barrier IDs to barrier control blocks. + * If ID corresponds to a local barrier, then it returns + * the_barrier control pointer which maps to ID and location + * is set to OBJECTS_LOCAL. if the barrier ID is global and + * resides on a remote node, then location is set to OBJECTS_REMOTE, + * and the_barrier is undefined. Otherwise, location is set + * to OBJECTS_ERROR and the_barrier is undefined. + */ +RTEMS_INLINE_ROUTINE POSIX_Barrier_Control *_POSIX_Barrier_Get ( + pthread_barrier_t *barrier, + Objects_Locations *location +) +{ + return (POSIX_Barrier_Control *) _Objects_Get( + &_POSIX_Barrier_Information, + (Objects_Id) *barrier, + location + ); +} + +/** + * @brief Check if a barrier control block is NULL. + * + * This function returns @c TRUE if the_barrier is @c NULL and @c FALSE + * otherwise. + * + * @param[in] the_barrier is the pointer to the barrier control block + * to be checked. + * + * @retval TRUE The barrier control block is @c NULL. + * @retval FALSE The barrier control block is not @c NULL. + */ +RTEMS_INLINE_ROUTINE bool _POSIX_Barrier_Is_null ( + POSIX_Barrier_Control *the_barrier +) +{ + return ( the_barrier == NULL ); +} + +#ifdef __cplusplus +} +#endif + +#endif +/* end of include file */ diff --git a/cpukit/posix/inline/rtems/posix/barrier.inl b/cpukit/posix/inline/rtems/posix/barrier.inl deleted file mode 100644 index 6e439d8c66..0000000000 --- a/cpukit/posix/inline/rtems/posix/barrier.inl +++ /dev/null @@ -1,96 +0,0 @@ -/** - * @file - * - * @brief Inlined Routines from the POSIX Barrier Manager - * - * This file contains the static inlin implementation of the inlined - * routines from the POSIX Barrier Manager. - */ - -/* - * COPYRIGHT (c) 1989-2011. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - */ - -#ifndef _RTEMS_POSIX_BARRIER_H -# error "Never use directly; include instead." -#endif - -#ifndef _RTEMS_POSIX_BARRIER_INL -#define _RTEMS_POSIX_BARRIER_INL - -#include - -/** - * @brief Allocate a barrier control block. - * - * This function allocates a barrier control block from - * the inactive chain of free barrier control blocks. - */ -RTEMS_INLINE_ROUTINE POSIX_Barrier_Control *_POSIX_Barrier_Allocate( void ) -{ - return (POSIX_Barrier_Control *) - _Objects_Allocate( &_POSIX_Barrier_Information ); -} - -/** - * @brief Free a barrier control block. - * - * This routine frees a barrier control block to the - * inactive chain of free barrier control blocks. - */ -RTEMS_INLINE_ROUTINE void _POSIX_Barrier_Free ( - POSIX_Barrier_Control *the_barrier -) -{ - _Objects_Free( &_POSIX_Barrier_Information, &the_barrier->Object ); -} - -/** - * @brief Get a barrier control block. - * - * This function maps barrier IDs to barrier control blocks. - * If ID corresponds to a local barrier, then it returns - * the_barrier control pointer which maps to ID and location - * is set to OBJECTS_LOCAL. if the barrier ID is global and - * resides on a remote node, then location is set to OBJECTS_REMOTE, - * and the_barrier is undefined. Otherwise, location is set - * to OBJECTS_ERROR and the_barrier is undefined. - */ -RTEMS_INLINE_ROUTINE POSIX_Barrier_Control *_POSIX_Barrier_Get ( - pthread_barrier_t *barrier, - Objects_Locations *location -) -{ - return (POSIX_Barrier_Control *) _Objects_Get( - &_POSIX_Barrier_Information, - (Objects_Id) *barrier, - location - ); -} - -/** - * @brief Check if a barrier control block is NULL. - * - * This function returns @c TRUE if the_barrier is @c NULL and @c FALSE - * otherwise. - * - * @param[in] the_barrier is the pointer to the barrier control block - * to be checked. - * - * @retval TRUE The barrier control block is @c NULL. - * @retval FALSE The barrier control block is not @c NULL. - */ -RTEMS_INLINE_ROUTINE bool _POSIX_Barrier_Is_null ( - POSIX_Barrier_Control *the_barrier -) -{ - return ( the_barrier == NULL ); -} - -#endif -/* end of include file */ diff --git a/cpukit/posix/preinstall.am b/cpukit/posix/preinstall.am index aee07c023e..c84a54b1b9 100644 --- a/cpukit/posix/preinstall.am +++ b/cpukit/posix/preinstall.am @@ -124,6 +124,10 @@ $(PROJECT_INCLUDE)/rtems/posix/barrier.h: include/rtems/posix/barrier.h $(PROJEC $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/barrier.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/barrier.h +$(PROJECT_INCLUDE)/rtems/posix/barrierimpl.h: include/rtems/posix/barrierimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/barrierimpl.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/barrierimpl.h + $(PROJECT_INCLUDE)/rtems/posix/rwlock.h: include/rtems/posix/rwlock.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/rwlock.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/rwlock.h @@ -152,10 +156,6 @@ $(PROJECT_INCLUDE)/rtems/posix/timer.inl: inline/rtems/posix/timer.inl $(PROJECT $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/timer.inl PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/timer.inl -$(PROJECT_INCLUDE)/rtems/posix/barrier.inl: inline/rtems/posix/barrier.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/barrier.inl -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/barrier.inl - $(PROJECT_INCLUDE)/rtems/posix/rwlock.inl: inline/rtems/posix/rwlock.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/rwlock.inl PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/rwlock.inl diff --git a/cpukit/posix/src/pbarrier.c b/cpukit/posix/src/pbarrier.c index 5023b5c01a..ff548bb385 100644 --- a/cpukit/posix/src/pbarrier.c +++ b/cpukit/posix/src/pbarrier.c @@ -29,7 +29,7 @@ #include #include -#include +#include /** * @brief _POSIX_Barrier_Manager_initialization diff --git a/cpukit/posix/src/pbarrierdestroy.c b/cpukit/posix/src/pbarrierdestroy.c index baf788e083..a178ec659e 100644 --- a/cpukit/posix/src/pbarrierdestroy.c +++ b/cpukit/posix/src/pbarrierdestroy.c @@ -22,7 +22,7 @@ #include #include -#include +#include /** * This directive allows a thread to delete a barrier specified by diff --git a/cpukit/posix/src/pbarrierinit.c b/cpukit/posix/src/pbarrierinit.c index edf7e7ca32..1cade2963d 100644 --- a/cpukit/posix/src/pbarrierinit.c +++ b/cpukit/posix/src/pbarrierinit.c @@ -24,7 +24,7 @@ #include #include -#include +#include /* * pthread_barrier_init diff --git a/cpukit/posix/src/pbarriertranslatereturncode.c b/cpukit/posix/src/pbarriertranslatereturncode.c index e9552d1f7d..f2ba58c315 100644 --- a/cpukit/posix/src/pbarriertranslatereturncode.c +++ b/cpukit/posix/src/pbarriertranslatereturncode.c @@ -24,7 +24,7 @@ #include #include -#include +#include /* * _POSIX_Barrier_Translate_core_barrier_return_code diff --git a/cpukit/posix/src/pbarrierwait.c b/cpukit/posix/src/pbarrierwait.c index e55faa8fde..036932ed96 100644 --- a/cpukit/posix/src/pbarrierwait.c +++ b/cpukit/posix/src/pbarrierwait.c @@ -22,7 +22,7 @@ #include #include -#include +#include /** * This directive allows a thread to wait at a barrier. -- cgit v1.2.3