threads: improve pthreads comp configury

hppritcha · hppritcha · commit 0f6541b7cf0f · 2019-04-08T10:56:13.000-06:00
use the OPAL_CONFIG_POSIX_THREADS macro

Signed-off-by: Howard Pritchard &lt;howardp@lanl.gov&gt;
diff --git a/opal/mca/threads/Makefile.am b/opal/mca/threads/Makefile.am
@@ -10,6 +10,7 @@
 # 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) 2019      Sandia National Laboratories.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
diff --git a/opal/mca/threads/base/Makefile.am b/opal/mca/threads/base/Makefile.am
@@ -9,6 +9,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
+#
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -18,7 +20,7 @@
 
 headers += \
         base/base.h \
-	base/threads_base_null.h
+        base/threads_base_null.h
 
 libmca_threads_la_SOURCES += \
         base/threads_base_open.c
diff --git a/opal/mca/threads/base/base.h b/opal/mca/threads/base/base.h
@@ -10,6 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
+ *
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/opal/mca/threads/base/threads_base_null.h b/opal/mca/threads/base/threads_base_null.h
@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,23 +24,29 @@ int opal_condition_t_class;
 int opal_mutex_t_class;
 int opal_recursive_mutex_t_class;
 
-int opal_thread_join(opal_thread_t *t, void **thr_return) {
+int opal_thread_join(opal_thread_t *t, void **thr_return)
+{
   return 0;
 }
 
-void opal_thread_set_main() {
+void opal_thread_set_main()
+{
   return 0;
 }
-int opal_thread_start(opal_thread_t *t) {
+int opal_thread_start(opal_thread_t *t)
+{
   return 0;
 }
+
 int *opal_thread_t_class = NULL;
 
 int opal_tsd_key_create(opal_tsd_key_t *key, opal_tsd_destructor_t destructor)
 {
   return 0;
 }
+
 int opal_uses_threads = 0;
+
 int opal_tsd_keys_destruct()
 {
   return 0;
diff --git a/opal/mca/threads/base/threads_base_open.c b/opal/mca/threads/base/threads_base_open.c
@@ -10,6 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
+ *
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/opal/mca/threads/condition.h b/opal/mca/threads/condition.h
@@ -13,6 +13,8 @@
  *                         reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2019      Sandia National Laboratories. All rights reserved.
+ *
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/opal/mca/threads/configure.m4 b/opal/mca/threads/configure.m4
@@ -11,6 +11,7 @@ dnl                         University of Stuttgart.  All rights reserved.
 dnl Copyright (c) 2004-2005 The Regents of the University of California.
 dnl                         All rights reserved.
 dnl Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow
diff --git a/opal/mca/threads/mutex.h b/opal/mca/threads/mutex.h
@@ -15,6 +15,7 @@
  *                         reserved.
  * Copyright (c) 2007      Voltaire. All rights reserved.
  * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
  *
  * $COPYRIGHT$
  *
diff --git a/opal/mca/threads/pthreads/Makefile.am b/opal/mca/threads/pthreads/Makefile.am
@@ -10,6 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
diff --git a/opal/mca/threads/pthreads/configure.m4 b/opal/mca/threads/pthreads/configure.m4
@@ -13,6 +13,8 @@
 # Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
+# Copyright (c) 2019      Triad National Security, LLC. All rights
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -50,10 +52,8 @@ AC_DEFUN([MCA_opal_threads_pthreads_CONFIG],[
                  [threads_pthreads_happy="no"])])
 
     AS_IF([test "$threads_pthreads_happy" = "yes"],
-          [AC_CHECK_HEADERS([mach/mach_time.h])
-           AC_CHECK_FUNC([mach_absolute_time],
-                         [threads_pthreads_happy="yes"],
-                         [threads_pthreads_happy="no"])])
+          [OPAL_CONFIG_POSIX_THREADS([threads_pthreads_happy="yes"],
+                                     [threads_pthreads_happy="no"])])
 
    AS_IF([test "$threads_pthreads_happy" = "no" && \
           test "$threads_pthreads_should_use" = "1"],
diff --git a/opal/mca/threads/pthreads/mutex_unix.h b/opal/mca/threads/pthreads/mutex_unix.h
@@ -14,6 +14,8 @@
  *                         reserved.
  * Copyright (c) 2015-2016 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
+ * 
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/opal/mca/threads/pthreads/threads_pthreads.h b/opal/mca/threads/pthreads/threads_pthreads.h
diff --git a/opal/mca/threads/pthreads/threads_pthreads_component.c b/opal/mca/threads/pthreads/threads_pthreads_component.c
@@ -12,6 +12,8 @@
  *                         All rights reserved.
  * Copyright (c) 2007-2015 Los Alamos National Security, LLC.  All rights
  *                         reserved.
+ * Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
+ *
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/opal/mca/threads/pthreads/threads_pthreads_condition.c b/opal/mca/threads/pthreads/threads_pthreads_condition.c
@@ -9,6 +9,8 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
+ *
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/opal/mca/threads/pthreads/threads_pthreads_mutex.c b/opal/mca/threads/pthreads/threads_pthreads_mutex.c
@@ -14,6 +14,8 @@
  *                         reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
+ *
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/opal/mca/threads/pthreads/threads_pthreads_wait_sync.c b/opal/mca/threads/pthreads/threads_pthreads_wait_sync.c
@@ -6,6 +6,8 @@
  * Copyright (c) 2016      Los Alamos National Security, LLC. All rights
  *                         reserved.
  * Copyright (c) 2017      IBM Corporation. All rights reserved.
+ * Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
+ *
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/opal/mca/threads/thread.h b/opal/mca/threads/thread.h
@@ -12,6 +12,8 @@
  *                         All rights reserved.
  * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2019      Sandia National Laboratories. All rights reserved.
+ *
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/opal/mca/threads/thread_usage.h b/opal/mca/threads/thread_usage.h
@@ -15,6 +15,7 @@
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2015-2016 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
diff --git a/opal/mca/threads/threads.h b/opal/mca/threads/threads.h
@@ -14,6 +14,7 @@
  * Copyright (c) 2015-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2017      Intel, Inc. All rights reserved.
+ * Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/opal/mca/threads/tsd.h b/opal/mca/threads/tsd.h
@@ -4,6 +4,8 @@
  * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2015-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2019      Sandia National Laboratories. All rights reserved.
+ *
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/opal/mca/threads/wait_sync.h b/opal/mca/threads/wait_sync.h
@@ -9,6 +9,7 @@
  * Copyright (c) 2016      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2017      IBM Corporation. All rights reserved.
+ * Copyright (c) 2019      Sandia National Laboratories.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`# Copyright (c) 2004-2005 The Regents of the University of California.`
`11`	`11`	`# All rights reserved.`
`12`	`12`	`# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.`
	`13`	`+# Copyright (c) 2019 Sandia National Laboratories. All rights reserved.`
`13`	`14`	`# $COPYRIGHT$`
`14`	`15`	`#`
`15`	`16`	`# Additional copyrights may follow`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`	`* Copyright (c) 2004-2005 The Regents of the University of California.`
`11`	`11`	`* All rights reserved.`
`12`	`12`	`* Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.`
	`13`	`+ * Copyright (c) 2019 Sandia National Laboratories. All rights reserved.`
	`14`	`+ *`
`13`	`15`	`* $COPYRIGHT$`
`14`	`16`	`*`
`15`	`17`	`* Additional copyrights may follow`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`* University of Stuttgart. All rights reserved.`
`10`	`10`	`* Copyright (c) 2004-2005 The Regents of the University of California.`
`11`	`11`	`* All rights reserved.`
	`12`	`+ * Copyright (c) 2019 Sandia National Laboratories. All rights reserved.`
`12`	`13`	`* $COPYRIGHT$`
`13`	`14`	`*`
`14`	`15`	`* Additional copyrights may follow`
`@@ -23,23 +24,29 @@ int opal_condition_t_class;`
`23`	`24`	`int opal_mutex_t_class;`
`24`	`25`	`int opal_recursive_mutex_t_class;`
`25`	`26`
`26`		`-int opal_thread_join(opal_thread_t t, void *thr_return) {`
	`27`	`+int opal_thread_join(opal_thread_t t, void *thr_return)`
	`28`	`+{`
`27`	`29`	`return 0;`
`28`	`30`	`}`
`29`	`31`
`30`		`-void opal_thread_set_main() {`
	`32`	`+void opal_thread_set_main()`
	`33`	`+{`
`31`	`34`	`return 0;`
`32`	`35`	`}`
`33`		`-int opal_thread_start(opal_thread_t *t) {`
	`36`	`+int opal_thread_start(opal_thread_t *t)`
	`37`	`+{`
`34`	`38`	`return 0;`
`35`	`39`	`}`
	`40`	`+`
`36`	`41`	`int *opal_thread_t_class = NULL;`
`37`	`42`
`38`	`43`	`int opal_tsd_key_create(opal_tsd_key_t *key, opal_tsd_destructor_t destructor)`
`39`	`44`	`{`
`40`	`45`	`return 0;`
`41`	`46`	`}`
	`47`	`+`
`42`	`48`	`int opal_uses_threads = 0;`
	`49`	`+`
`43`	`50`	`int opal_tsd_keys_destruct()`
`44`	`51`	`{`
`45`	`52`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`	`* reserved.`
`14`	`14`	`* Copyright (c) 2015 Research Organization for Information Science`
`15`	`15`	`* and Technology (RIST). All rights reserved.`
	`16`	`+ * Copyright (c) 2019 Sandia National Laboratories. All rights reserved.`
	`17`	`+ *`
`16`	`18`	`* $COPYRIGHT$`
`17`	`19`	`*`
`18`	`20`	`* Additional copyrights may follow`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`* reserved.`
`16`	`16`	`* Copyright (c) 2007 Voltaire. All rights reserved.`
`17`	`17`	`* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.`
	`18`	`+ * Copyright (c) 2019 Sandia National Laboratories. All rights reserved.`
`18`	`19`	`*`
`19`	`20`	`* $COPYRIGHT$`
`20`	`21`	`*`