2 files changed, 140 insertions, 42 deletions
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 <rtems/score/object.h>
+#include <rtems/score/corebarrier.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup POSIXBarrier POSIX Barriers
  *
@@ -36,13 +43,6 @@
  */
 /**@{**/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/object.h>
-#include <rtems/score/corebarrier.h>
-
 /**
  * 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 <rtems/posix/barrier.inl>
-#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 <rtems/posix/barrier.h>
+
+#include <pthread.h>
+
+#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 */