fix thread_usage.h

Signed-off-by: Noah Evans <nevans@sandia.gov>

Author: Noah Evans

opal/mca/threads/base/Makefile.am

@@ -19,8 +19,7 @@
 #
 
 headers += \
-        base/base.h \
-        base/threads_base_null.h
+        base/base.h
 
 libmca_threads_la_SOURCES += \
         base/threads_base_open.c

opal/mca/threads/base/threads_base_null.h

@@ -35,13 +35,7 @@ AC_DEFUN([MCA_opal_threads_CONFIG],[
         # first, compile all the components
         MCA_CONFIGURE_FRAMEWORK($1, $2, 1)
 
-        # someone should have set this...
-        if test "$threads_base_include" = "" ; then
-            threads_base_include="base/threads_base_null.h"
-        fi
-
         if test "$mutex_base_include" = "" ; then
-#            mutex_base_include="base/mutex_base_null.h"
             mutex_base_include="pthreads/mutex_unix.h"
         fi
         AC_DEFINE_UNQUOTED([MCA_threads_IMPLEMENTATION_HEADER],

opal/mca/threads/configure.m4

@@ -29,24 +29,26 @@
 
 #include "opal_config.h"
 
-#include MCA_mutex_IMPLEMENTATION_HEADER
-
-BEGIN_C_DECLS
-
 /**
- * @file:
+* @file:
  *
  * Mutual exclusion functions.
  *
  * Functions for locking of critical sections.
  */
 
+
 /**
  * Opaque mutex object
  */
+
 typedef struct opal_mutex_t opal_mutex_t;
 typedef struct opal_mutex_t opal_recursive_mutex_t;
 
+BEGIN_C_DECLS
+#include MCA_mutex_IMPLEMENTATION_HEADER
+END_C_DECLS
+
 OBJ_CLASS_DECLARATION(opal_mutex_t);
 OBJ_CLASS_DECLARATION(opal_recursive_mutex_t);
 
@@ -100,11 +102,6 @@ static inline void opal_mutex_atomic_lock(opal_mutex_t *mutex);
  */
 static inline void opal_mutex_atomic_unlock(opal_mutex_t *mutex);
 
-END_C_DECLS
-
-#include MCA_mutex_IMPLEMENTATION_HEADER
-
-BEGIN_C_DECLS
 
 /**
  * Lock a mutex if opal_using_threads() says that multiple threads may

opal/mca/threads/mutex.h

@@ -118,7 +118,7 @@ OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_recursive_mutex_t);
  *
  ************************************************************************/
 
-static inline int opal_mutex_trylock(struct opal_mutex_t *m)
+static inline int opal_mutex_trylock(opal_mutex_t *m)
 {
 #if OPAL_ENABLE_DEBUG
     int ret = pthread_mutex_trylock(&m->m_lock_pthread);
@@ -133,7 +133,7 @@ static inline int opal_mutex_trylock(struct opal_mutex_t *m)
 #endif
 }
 
-static inline void opal_mutex_lock(struct opal_mutex_t *m)
+static inline void opal_mutex_lock(opal_mutex_t *m)
 {
 #if OPAL_ENABLE_DEBUG
     int ret = pthread_mutex_lock(&m->m_lock_pthread);
@@ -147,7 +147,7 @@ static inline void opal_mutex_lock(struct opal_mutex_t *m)
 #endif
 }
 
-static inline void opal_mutex_unlock(struct opal_mutex_t *m)
+static inline void opal_mutex_unlock(opal_mutex_t *m)
 {
 #if OPAL_ENABLE_DEBUG
     int ret = pthread_mutex_unlock(&m->m_lock_pthread);
@@ -173,17 +173,17 @@ static inline void opal_mutex_unlock(struct opal_mutex_t *m)
  * Spin Locks
  ************************************************************************/
 
-static inline int opal_mutex_atomic_trylock(struct opal_mutex_t *m)
+static inline int opal_mutex_atomic_trylock(opal_mutex_t *m)
 {
     return opal_atomic_trylock(&m->m_lock_atomic);
 }
 
-static inline void opal_mutex_atomic_lock(struct opal_mutex_t *m)
+static inline void opal_mutex_atomic_lock(opal_mutex_t *m)
 {
     opal_atomic_lock(&m->m_lock_atomic);
 }
 
-static inline void opal_mutex_atomic_unlock(struct opal_mutex_t *m)
+static inline void opal_mutex_atomic_unlock(opal_mutex_t *m)
 {
     opal_atomic_unlock(&m->m_lock_atomic);
 }
@@ -194,17 +194,17 @@ static inline void opal_mutex_atomic_unlock(struct opal_mutex_t *m)
  * Standard locking
  ************************************************************************/
 
-static inline int opal_mutex_atomic_trylock(struct opal_mutex_t *m)
+static inline int opal_mutex_atomic_trylock(opal_mutex_t *m)
 {
     return opal_mutex_trylock(m);
 }
 
-static inline void opal_mutex_atomic_lock(struct opal_mutex_t *m)
+static inline void opal_mutex_atomic_lock(opal_mutex_t *m)
 {
     opal_mutex_lock(m);
 }
 
-static inline void opal_mutex_atomic_unlock(struct opal_mutex_t *m)
+static inline void opal_mutex_atomic_unlock(opal_mutex_t *m)
 {
     opal_mutex_unlock(m);
 }

opal/mca/threads/pthreads/mutex_unix.h

@@ -60,10 +60,6 @@ bool opal_thread_self_compare(opal_thread_t *t)
     return t->t_handle == pthread_self();
 }
 
-int sync_wait_mt(void *p) {
-	return 0;
-}
-
 int opal_thread_join(opal_thread_t *t, void **thr_return) {
     int rc = pthread_join(t->t_handle, thr_return);
     t->t_handle = (pthread_t) -1;