a bit more PR feedback

Signed-off-by: Howard Pritchard <[email protected]>

Author: hppritcha

opal/mca/pmix/base/base.h

@@ -37,8 +37,6 @@ OPAL_DECLSPEC int opal_pmix_base_exchange(pmix_info_t *info,
                                           pmix_pdata_t *pdat,
                                           int timeout);
 
-#define opal_pmix_condition_signal(a)    opal_cond_signal(a)
-
 typedef struct {
     opal_event_base_t *evbase;
     int timeout;

opal/mca/threads/Makefile.am

@@ -9,7 +9,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2010-2020 Cisco Systems, Inc.  All rights reserved
 # Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
 # $COPYRIGHT$
 #
@@ -23,7 +23,14 @@ noinst_LTLIBRARIES = libmca_threads.la
 libmca_threads_la_SOURCES =
 
 # local files
-headers = threads.h
+headers = \
+        condition.h \
+        mutex.h \
+        thread.h \
+        threads.h \
+        thread_usage.h \
+        tsd.h \
+        wait_sync.h
 nodist_headers =
 libmca_threads_la_SOURCES += $(headers)
 

opal/mca/threads/qthreads/threads_qthreads_condition.c

@@ -35,11 +35,8 @@ static void opal_condition_construct(opal_condition_t *c)
 }
 
 
-static void opal_condition_destruct(opal_condition_t *c)
-{
-}
 
 OBJ_CLASS_INSTANCE(opal_condition_t,
                    opal_object_t,
                    opal_condition_construct,
-                   opal_condition_destruct);
+                   NULL);

opal/mca/threads/qthreads/threads_qthreads_mutex.h

@@ -114,45 +114,20 @@ static inline int opal_mutex_trylock(opal_mutex_t *m)
 {
     ensure_init_qthreads();
 
-#if OPAL_ENABLE_DEBUG
-    int ret = qthread_readFE_nb(NULL, &m->m_lock_qthreads);
-    if (ret != 0) {
-        errno = ret;
-        opal_output(0, "opal_mutex_trylock() %d", ret);
-    }
-    return ret;
-#else
     return qthread_readFE_nb(NULL, &m->m_lock_qthreads);
-#endif
 }
 
 static inline void opal_mutex_lock(opal_mutex_t *m)
 {
     ensure_init_qthreads();
-#if OPAL_ENABLE_DEBUG
-    int ret = qthread_lock(&m->m_lock_qthreads);
-    if (ret != 0) {
-        errno = ret;
-        opal_output(0, "opal_mutex_lock() %d", ret);
-    }
-#else
     qthread_lock(&m->m_lock_qthreads);
-#endif
 }
 
 static inline void opal_mutex_unlock(opal_mutex_t *m)
 {
     ensure_init_qthreads();
 
-#if OPAL_ENABLE_DEBUG
-    int ret = qthread_unlock(&m->m_lock_qthreads);
-    if (ret != 0) {
-        errno = ret;
-        opal_output(0, "opal_mutex_unlock() %d", ret);
-    }
-#else
     qthread_unlock(&m->m_lock_qthreads);
-#endif
     /* For fairness of locking. */
     qthread_yield();
 }

opal/runtime/opal_params.c

@@ -12,7 +12,7 @@
  *                         All rights reserved.
  * Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
  *                         reserved.
- * Copyright (c) 2008-2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2008-2020 Cisco Systems, Inc.  All rights reserved
  * Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
  * Copyright (c) 2010-2014 Los Alamos National Security, LLC.
  *                         All rights reserved.
@@ -62,7 +62,7 @@ bool opal_timing_overhead = true;
 #endif
 
 #if OPAL_ENABLE_DEBUG
-bool opal_debug_threads;
+bool opal_debug_threads = false;
 #endif
 
 bool opal_built_with_cuda_support = OPAL_INT_TO_BOOL(OPAL_CUDA_SUPPORT);