opal/mca/threads: minor cleanup

- Remove unnecessary header files
- Remove weird empty lines
- Add parenthesis for macros

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/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

@@ -58,30 +58,30 @@ typedef struct ompi_wait_sync_t {
  * as possible. Note that the race window is small so spinning here
  * is more optimal than sleeping since this macro is called in
  * the critical path. */
-#define WAIT_SYNC_RELEASE(sync)                                \
-    if (opal_using_threads()) {                                \
-        while ((sync)->signaling) {                            \
-            if (OPAL_THREAD_YIELD_WHEN_IDLE_DEFAULT) {         \
-                opal_thread_yield();                           \
-            }                                                  \
-            continue;                                          \
-        }                                                      \
-        opal_thread_internal_cond_destroy(&(sync)->condition); \
-        opal_thread_internal_mutex_destroy(&(sync)->lock);     \
+#define WAIT_SYNC_RELEASE(sync)                                  \
+    if (opal_using_threads()) {                                  \
+        while ((sync)->signaling) {                              \
+            if (OPAL_THREAD_YIELD_WHEN_IDLE_DEFAULT) {           \
+                opal_thread_yield();                             \
+            }                                                    \
+            continue;                                            \
+        }                                                        \
+        opal_thread_internal_cond_destroy(&((sync)->condition)); \
+        opal_thread_internal_mutex_destroy(&((sync)->lock));     \
     }
 
-#define WAIT_SYNC_RELEASE_NOWAIT(sync)                         \
-    if (opal_using_threads()) {                                \
-        opal_thread_internal_cond_destroy(&(sync)->condition); \
-        opal_thread_internal_mutex_destroy(&(sync)->lock);     \
+#define WAIT_SYNC_RELEASE_NOWAIT(sync)                           \
+    if (opal_using_threads()) {                                  \
+        opal_thread_internal_cond_destroy(&((sync)->condition)); \
+        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)  \
@@ -110,17 +110,17 @@ static inline int sync_wait_st(ompi_wait_sync_t *sync)
     return sync->status;
 }
 
-#define WAIT_SYNC_INIT(sync, c)                                    \
-    do {                                                           \
-        (sync)->count = (c);                                       \
-        (sync)->next = NULL;                                       \
-        (sync)->prev = NULL;                                       \
-        (sync)->status = 0;                                        \
-        (sync)->signaling = (0 != (c));                            \
-        if (opal_using_threads()) {                                \
-            opal_thread_internal_cond_init(&(sync)->condition);    \
-            opal_thread_internal_mutex_init(&(sync)->lock, false); \
-        }                                                          \
+#define WAIT_SYNC_INIT(sync, c)                                      \
+    do {                                                             \
+        (sync)->count = (c);                                         \
+        (sync)->next = NULL;                                         \
+        (sync)->prev = NULL;                                         \
+        (sync)->status = 0;                                          \
+        (sync)->signaling = (0 != (c));                              \
+        if (opal_using_threads()) {                                  \
+            opal_thread_internal_cond_init(&((sync)->condition));    \
+            opal_thread_internal_mutex_init(&((sync)->lock), false); \
+        }                                                            \
     } while (0)
 
 /**