Threads squash rebase

configure.ac

@@ -931,7 +931,7 @@ OPAL_CHECK_BROKEN_QSORT
 #
 # Check out what thread support we have
 #
-OPAL_CONFIG_THREADS
+#OPAL_CONFIG_THREADS
 
 CFLAGS="$CFLAGS $THREAD_CFLAGS"
 CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS"

opal/Makefile.am

@@ -71,7 +71,6 @@ endif
 include class/Makefile.am
 include memoryhooks/Makefile.am
 include runtime/Makefile.am
-include threads/Makefile.am
 include mca/Makefile.am
 include tools/Makefile.am
 include dss/Makefile.am

opal/mca/event/event.h

@@ -48,6 +48,8 @@ BEGIN_C_DECLS
 
 #define OPAL_TIMEOUT_DEFAULT	{1, 0}
 
+OPAL_DECLSPEC void opal_event_use_threads(void);
+
 /**
  * Structure for event components.
  */

opal/mca/event/external/external.h

@@ -71,9 +71,6 @@ OPAL_DECLSPEC int opal_event_finalize(void);
 
 #define opal_event_set_priority(x, n) event_priority_set((x), (n))
 
-/* thread support APIs */
-#define opal_event_use_threads() evthread_use_pthreads()
-
 /* Basic event APIs */
 #define opal_event_enable_debug_mode() event_enable_debug_mode()
 

opal/mca/event/libevent2022/libevent2022.h

@@ -102,9 +102,6 @@ OPAL_DECLSPEC int opal_event_finalize(void);
 
 #define opal_event_set_priority(x, n) event_priority_set((x), (n))
 
-/* thread support APIs */
-#define opal_event_use_threads() evthread_use_pthreads()
-
 /* Basic event APIs */
 #define opal_event_enable_debug_mode() event_enable_debug_mode()
 

opal/mca/threads/Makefile.am

@@ -0,0 +1,40 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         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) 2019      Sandia National Laboratories.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# main library setup
+noinst_LTLIBRARIES = libmca_threads.la
+libmca_threads_la_SOURCES =
+
+# local files
+headers = threads.h
+nodist_headers =
+libmca_threads_la_SOURCES += $(headers)
+
+# Conditionally install the header files
+if WANT_INSTALL_HEADERS
+opaldir = $(opalincludedir)/$(subdir)
+nobase_opal_HEADERS = $(headers)
+nobase_nodist_opal_HEADERS = $(nodist_headers)
+endif
+
+include base/Makefile.am
+
+distclean-local:
+	rm -f base/static-components.h

opal/mca/threads/base/Makefile.am

@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         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
+#
+# $HEADER$
+#
+
+headers += \
+        base/base.h \
+        base/threads_base_null.h
+
+libmca_threads_la_SOURCES += \
+        base/threads_base_open.c

opal/mca/threads/base/base.h

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2014 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * 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
+ *
+ * $HEADER$
+ *
+ */
+
+#ifndef OPAL_THREADS_BASE_H
+#define OPAL_THREADS_BASE_H
+
+#include "opal_config.h"
+#include "opal/mca/base/mca_base_framework.h"
+#include "opal/mca/threads/threads.h"
+
+
+/*
+ * Global functions for MCA overall threads open and close
+ */
+
+BEGIN_C_DECLS
+
+/**
+ * Framework structure declaration
+ */
+OPAL_DECLSPEC extern mca_base_framework_t opal_threads_base_framework;
+
+END_C_DECLS
+
+/* include implementation to call */
+#include MCA_threads_IMPLEMENTATION_HEADER
+
+#endif /* OPAL_BASE_THREADS_H */

opal/mca/threads/base/owner.txt

@@ -0,0 +1,7 @@
+#
+# owner/status file
+# owner: institution that is responsible for this package
+# status: e.g. active, maintenance, unmaintained
+#
+owner: SNL
+status: maintenance

opal/mca/threads/base/threads_base_null.h

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2005 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         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
+ *
+ * $HEADER$
+ */
+
+#ifndef OPAL_MCA_TIMER_BASE_TIMER_BASE_NULL_H
+#define OPAL_MCA_TIMER_BASE_TIMER_BASE_NULL_H
+
+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)
+{
+  return 0;
+}
+
+void opal_thread_set_main()
+{
+  return 0;
+}
+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;
+}
+#endif

opal/mca/threads/base/threads_base_open.c

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2014 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         University of Stuttgart.  All rights reserved.
+ * 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
+ *
+ * $HEADER$
+ */
+
+
+#include "opal_config.h"
+
+#include "opal/constants.h"
+#include "opal/mca/threads/base/base.h"
+
+
+/*
+ * The following file was created by configure.  It contains extern
+ * statements and the definition of an array of pointers to each
+ * component's public mca_base_component_t struct.
+ */
+#include "opal/mca/threads/base/static-components.h"
+
+static int mca_threads_base_register(mca_base_register_flag_t flags)
+{
+   // Do I need to register anything here?
+    return OPAL_SUCCESS;
+}
+
+/*
+ * Globals
+ */
+/* Use default register/open/close functions */
+MCA_BASE_FRAMEWORK_DECLARE(opal, threads, "OPAL OS threads", mca_threads_base_register, NULL, NULL,
+                           mca_threads_base_static_components, 0);