2008-01-09 Joel Sherrill <joel.sherrill@OARcorp.com>

	* posix/Makefile.am, posix/include/rtems/posix/cond.h,
	posix/include/rtems/posix/mutex.h, posix/inline/rtems/posix/cond.inl,
	posix/inline/rtems/posix/mutex.inl: Do not include POSIX Mutex or
	Condition Variable object get helpers because they are more
	complicated than the norm. They can implicitly perform a create. They
	cross the line as being too complex and large to inline since they
	negatively impact size and binary test coverage.
	* posix/src/condget.c, posix/src/mutexget.c: New files.

2 files changed, 143 insertions, 0 deletions

diff --git a/cpukit/posix/src/condget.c b/cpukit/posix/src/condget.c
new file mode 100644
index 0000000000..03ffebbd09
--- /dev/null
+++ b/cpukit/posix/src/condget.c
@@ -0,0 +1,59 @@
+/*
+ *  COPYRIGHT (c) 1989-2007.
+ *  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.
+ *
+ *  $Id$
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <pthread.h>
+#include <errno.h>
+
+#include <rtems/system.h>
+#include <rtems/score/object.h>
+#include <rtems/score/states.h>
+#include <rtems/score/watchdog.h>
+#include <rtems/posix/cond.h>
+#include <rtems/posix/time.h>
+#include <rtems/posix/mutex.h>
+
+POSIX_Condition_variables_Control *_POSIX_Condition_variables_Get (
+  pthread_cond_t    *cond,
+  Objects_Locations *location
+)
+{
+  Objects_Id        *id = (Objects_Id *)cond;
+  int status;
+
+  if ( !id ) {
+    *location = OBJECTS_ERROR;
+    return (POSIX_Condition_variables_Control *) 0;
+  }
+
+  if ( *id == PTHREAD_COND_INITIALIZER ) {
+    /*
+     *  Do an "auto-create" here.
+     */
+
+    status = pthread_cond_init( (pthread_cond_t *)id, 0 );
+    if ( status ) {
+      *location = OBJECTS_ERROR;
+      return (POSIX_Condition_variables_Control *) 0;
+    }
+  }
+
+  /*
+   *  Now call Objects_Get()
+   */
+
+  return (POSIX_Condition_variables_Control *)
+    _Objects_Get( &_POSIX_Condition_variables_Information, *id, location );
+}
+ 
diff --git a/cpukit/posix/src/mutexget.c b/cpukit/posix/src/mutexget.c
new file mode 100644
index 0000000000..4a05ddd9a2
--- /dev/null
+++ b/cpukit/posix/src/mutexget.c
@@ -0,0 +1,84 @@
+/*
+ *  Convert POSIX Mutex ID to local object pointer
+ *
+ *  COPYRIGHT (c) 1989-2007.
+ *  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.
+ *
+ *  $Id$
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <errno.h>
+#include <pthread.h>
+
+#include <rtems/system.h>
+#include <rtems/score/coremutex.h>
+#if defined(RTEMS_MULTIPROCESSING)
+#include <rtems/score/mpci.h>
+#endif
+#include <rtems/posix/mutex.h>
+
+
+/*
+ *  _POSIX_Mutex_Get_support
+ *
+ *  NOTE: The support macro makes it possible for both to use exactly
+ *        the same code to check for NULL id pointer and
+ *        PTHREAD_MUTEX_INITIALIZER without adding overhead.
+ */
+
+#define ___POSIX_Mutex_Get_support( _id, _location ) \
+  do { \
+    int _status; \
+    \
+    if ( !_id ) { \
+      *_location = OBJECTS_ERROR; \
+      return (POSIX_Mutex_Control *) 0; \
+    }  \
+    \
+    if ( *_id == PTHREAD_MUTEX_INITIALIZER ) { \
+      /* \
+       *  Do an "auto-create" here. \
+       */ \
+    \
+      _status = pthread_mutex_init( (pthread_mutex_t *)_id, 0 ); \
+      if ( _status ) { \
+        *_location = OBJECTS_ERROR;  \
+        return (POSIX_Mutex_Control *) 0; \
+      } \
+    } \
+  } while (0)
+ 
+POSIX_Mutex_Control *_POSIX_Mutex_Get (
+  pthread_mutex_t   *mutex,
+  Objects_Locations *location
+)
+{
+  Objects_Id *id = (Objects_Id *)mutex;
+
+  ___POSIX_Mutex_Get_support( id, location );
+
+  return (POSIX_Mutex_Control *)
+    _Objects_Get( &_POSIX_Mutex_Information, *id, location );
+}
+
+POSIX_Mutex_Control *_POSIX_Mutex_Get_interrupt_disable (
+  pthread_mutex_t   *mutex,
+  Objects_Locations *location,
+  ISR_Level         *level
+)
+{
+  Objects_Id *id = (Objects_Id *)mutex;
+
+  ___POSIX_Mutex_Get_support( id, location );
+
+  return (POSIX_Mutex_Control *)
+    _Objects_Get_isr_disable( &_POSIX_Mutex_Information, *id, location, level );
+}