opal/mca/threads: minor cleanup

- Remove unnecessary "include"
- Remove weird empty lines
- Clean up parentheses for macros
- Remove EDEADLK check for trylock() and unlock()

Signed-off-by: Shintaro Iwasaki <[email protected]>

Author: shintaro-iwasaki

opal/mca/threads/argobots/threads_argobots_mutex.h

@@ -31,7 +31,6 @@
 
 #include "opal_config.h"
 
-#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 

opal/mca/threads/base/mutex.c

@@ -26,9 +26,6 @@
 
 #include "opal_config.h"
 
-#include <errno.h>
-#include <pthread.h>
-
 #include "opal/constants.h"
 #include "opal/mca/threads/mutex.h"
 

opal/mca/threads/mutex.h

@@ -53,9 +53,7 @@ typedef struct opal_mutex_t opal_recursive_mutex_t;
 
 struct opal_mutex_t {
     opal_object_t super;
-
     opal_thread_internal_mutex_t m_lock;
-
 #if OPAL_ENABLE_DEBUG
     int m_lock_debug;
     const char *m_lock_file;

opal/mca/threads/pthreads/threads_pthreads_mutex.h

@@ -121,23 +121,13 @@ static inline void opal_thread_internal_mutex_lock(opal_thread_internal_mutex_t
 static inline int opal_thread_internal_mutex_trylock(opal_thread_internal_mutex_t *p_mutex)
 {
     int ret = pthread_mutex_trylock(p_mutex);
-#if OPAL_ENABLE_DEBUG
-    if (EDEADLK == ret) {
-        opal_output(0, "opal_thread_internal_mutex_trylock() %d", ret);
-        return 1;
-    }
-#endif
     return 0 == ret ? 0 : 1;
-    ;
 }
 
 static inline void opal_thread_internal_mutex_unlock(opal_thread_internal_mutex_t *p_mutex)
 {
 #if OPAL_ENABLE_DEBUG
     int ret = pthread_mutex_unlock(p_mutex);
-    if (EDEADLK == ret) {
-        opal_output(0, "opal_thread_internal_mutex_unlock() %d", ret);
-    }
     assert(0 == ret);
 #else
     pthread_mutex_unlock(p_mutex);

opal/mca/threads/qthreads/threads_qthreads_mutex.h

@@ -32,7 +32,6 @@
 
 #include "opal_config.h"
 
-#include <errno.h>
 #include <stdio.h>
 
 #include "opal/class/opal_object.h"

opal/mca/threads/wait_sync.h

@@ -77,12 +77,12 @@ typedef struct ompi_wait_sync_t {
         opal_thread_internal_mutex_destroy(&(sync)->lock);     \
     }
 
-#define WAIT_SYNC_SIGNAL(sync)                              \
-    if (opal_using_threads()) {                             \
-        opal_thread_internal_mutex_lock(&(sync->lock));     \
-        opal_thread_internal_cond_signal(&sync->condition); \
-        opal_thread_internal_mutex_unlock(&(sync->lock));   \
-        sync->signaling = false;                            \
+#define WAIT_SYNC_SIGNAL(sync)                                \
+    if (opal_using_threads()) {                               \
+        opal_thread_internal_mutex_lock(&(sync)->lock);       \
+        opal_thread_internal_cond_signal(&(sync)->condition); \
+        opal_thread_internal_mutex_unlock(&(sync)->lock);     \
+        (sync)->signaling = false;                            \
     }
 
 #define WAIT_SYNC_SIGNALLED(sync)  \