Replace the use of opal_output by opal_show_help in supported threading mca backends.

Signed-off-by: Jan Ciesko <[email protected]>

Author: janciesko

opal/mca/threads/argobots/threads_argobots_mutex.h

@@ -19,6 +19,7 @@
  *                         reserved.
  * Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2021      Argonne National Laboratory.  All rights reserved.
+ * Copyright (c) 2022      Sandia National Laboratories.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -39,6 +40,7 @@
 #include "opal/mca/threads/argobots/threads_argobots.h"
 #include "opal/mca/threads/mutex.h"
 #include "opal/util/output.h"
+#include "opal/util/show_help.h"
 
 BEGIN_C_DECLS
 
@@ -66,7 +68,7 @@ static inline void opal_thread_internal_mutex_lock(opal_thread_internal_mutex_t
 #if OPAL_ENABLE_DEBUG
     int ret = ABT_mutex_lock(mutex);
     if (ABT_SUCCESS != ret) {
-        opal_output(0, "opal_thread_internal_mutex_lock()");
+        opal_show_help("help-opal-threads.txt", "mutex lock failed", true);
     }
 #else
     ABT_mutex_lock(mutex);
@@ -81,7 +83,7 @@ static inline int opal_thread_internal_mutex_trylock(opal_thread_internal_mutex_
         return 1;
     } else if (ABT_SUCCESS != ret) {
 #if OPAL_ENABLE_DEBUG
-        opal_output(0, "opal_thread_internal_mutex_trylock()");
+        opal_show_help("help-opal-threads.txt", "mutex trylock failed", true);
 #endif
         return 1;
     }
@@ -94,7 +96,7 @@ static inline void opal_thread_internal_mutex_unlock(opal_thread_internal_mutex_
 #if OPAL_ENABLE_DEBUG
     int ret = ABT_mutex_unlock(mutex);
     if (ABT_SUCCESS != ret) {
-        opal_output(0, "opal_thread_internal_mutex_unlock()");
+        opal_show_help("help-opal-threads.txt", "mutex unlock failed", true);
     }
 #else
     ABT_mutex_unlock(mutex);

opal/mca/threads/base/help-opal-threads.txt

@@ -0,0 +1,22 @@
+# -*- text -*-
+#
+# Copyright (c) 2022      Sandia National Laboratories.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+# This is the US/English help file for Open MPI's OPAL thread MCA.
+#
+[mutex init failed]
+A mutex initialization has failed.
+
+[mutex lock failed]
+A mutex acquire (mutex lock) has failed.
+
+[mutex unlock failed]
+A mutex release (mutex unlock) has failed.
+
+[mutex trylock failed]
+A try to acquire a mutex (mutex trylock) has failed.

opal/mca/threads/pthreads/threads_pthreads_mutex.h

@@ -48,7 +48,7 @@
 
 #include "opal/class/opal_object.h"
 #include "opal/constants.h"
-#include "opal/util/output.h"
+#include "opal/util/show_help.h"
 
 BEGIN_C_DECLS
 
@@ -110,7 +110,7 @@ static inline void opal_thread_internal_mutex_lock(opal_thread_internal_mutex_t
 #if OPAL_ENABLE_DEBUG
     int ret = pthread_mutex_lock(p_mutex);
     if (EDEADLK == ret) {
-        opal_output(0, "opal_thread_internal_mutex_lock() %d", ret);
+        opal_show_help("help-opal-threads.txt", "mutex lock failed", true);
     }
     assert(0 == ret);
 #else

opal/mca/threads/qthreads/threads_qthreads_mutex.h

@@ -39,7 +39,7 @@
 #include "opal/constants.h"
 #include "opal/mca/threads/qthreads/threads_qthreads.h"
 #include "opal/sys/atomic.h"
-#include "opal/util/output.h"
+#include "opal/util/show_help.h"
 
 BEGIN_C_DECLS
 
@@ -55,7 +55,7 @@ static inline int opal_thread_internal_mutex_init(opal_thread_internal_mutex_t *
     #if OPAL_ENABLE_DEBUG
     int ret = qthread_spinlock_init(p_mutex,recursive);
     if (QTHREAD_SUCCESS != ret) {
-        opal_output(0, "opal_thread_internal_mutex_init()");
+        opal_show_help("help-opal-threads.txt", "mutex init failed", true);
     }
     #else
     qthread_spinlock_init(p_mutex,recursive);
@@ -69,7 +69,7 @@ static inline void opal_thread_internal_mutex_lock(opal_thread_internal_mutex_t
     #if OPAL_ENABLE_DEBUG
     int ret = qthread_spinlock_lock(p_mutex);
     if (QTHREAD_SUCCESS != ret) {
-        opal_output(0, "opal_thread_internal_mutex_lock()");
+        opal_show_help("help-opal-threads.txt", "mutex lock failed", true);
     }
     #else
     qthread_spinlock_lock(p_mutex);
@@ -84,7 +84,7 @@ static inline int opal_thread_internal_mutex_trylock(opal_thread_internal_mutex_
         return 1;
     } else if (QTHREAD_SUCCESS != ret) {
 #if OPAL_ENABLE_DEBUG
-        opal_output(0, "opal_thread_internal_mutex_trylock()");
+        opal_show_help("help-opal-threads.txt", "mutex trylock failed", true);
 #endif
         return 1;
     } 
@@ -98,7 +98,7 @@ static inline void opal_thread_internal_mutex_unlock(opal_thread_internal_mutex_
     #if OPAL_ENABLE_DEBUG
     ret = qthread_spinlock_unlock(p_mutex);
     if (QTHREAD_SUCCESS != ret) {
-        opal_output(0, "opal_thread_internal_mutex_unlock()");
+        opal_show_help("help-opal-threads.txt", "mutex unlock failed", true);
     }
     #else
     qthread_spinlock_unlock(p_mutex);