From 4d3200628dc294e793b5a7512141de4c1f09649c Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Wed, 9 Jan 2008 22:08:31 +0000
Subject: 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.
---
 cpukit/posix/inline/rtems/posix/cond.inl  | 39 --------------------
 cpukit/posix/inline/rtems/posix/mutex.inl | 59 -------------------------------
 2 files changed, 98 deletions(-)

(limited to 'cpukit/posix/inline/rtems')

diff --git a/cpukit/posix/inline/rtems/posix/cond.inl b/cpukit/posix/inline/rtems/posix/cond.inl
index 7d112cdf12..bbc220a96f 100644
--- a/cpukit/posix/inline/rtems/posix/cond.inl
+++ b/cpukit/posix/inline/rtems/posix/cond.inl
@@ -49,45 +49,6 @@ RTEMS_INLINE_ROUTINE void _POSIX_Condition_variables_Free (
   );
 }
  
-/*PAGE
- *
- *  _POSIX_Condition_variables_Get
- */
-
-RTEMS_INLINE_ROUTINE 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 );
-}
- 
 /*PAGE
  *
  *  _POSIX_Condition_variables_Is_null
diff --git a/cpukit/posix/inline/rtems/posix/mutex.inl b/cpukit/posix/inline/rtems/posix/mutex.inl
index cfe9df4b2f..d425b3cafc 100644
--- a/cpukit/posix/inline/rtems/posix/mutex.inl
+++ b/cpukit/posix/inline/rtems/posix/mutex.inl
@@ -42,65 +42,6 @@ RTEMS_INLINE_ROUTINE void _POSIX_Mutex_Free (
   _Objects_Free( &_POSIX_Mutex_Information, &the_mutex->Object );
 }
  
-/*PAGE
- *
- *  _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)
- 
-RTEMS_INLINE_ROUTINE 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 );
-}
-
-RTEMS_INLINE_ROUTINE 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 );
-}
-
- 
 /*PAGE
  *
  *  _POSIX_Mutex_Is_null
-- 
cgit v1.2.3