mca/threads/qthreads: rework configury to be smarter

Signed-off-by: Shintaro Iwasaki <siwasaki@anl.gov>

Author: shintaro-iwasaki

.gitignore

@@ -688,3 +688,4 @@ test/util/bipartite_graph
 opal/test/reachable/reachable_netlink
 opal/test/reachable/reachable_weighted
 opal/mca/threads/argobots/threads_argobots.h
+opal/mca/threads/qthreads/threads_qthreads.h

opal/mca/threads/qthreads/Makefile.am

@@ -19,12 +19,37 @@
 # $HEADER$
 #
 
-noinst_LTLIBRARIES = libmca_threads_qthreads.la
+AM_CPPFLAGS = $(opal_qthreads_CPPFLAGS)
 
-libmca_threads_qthreads_la_SOURCES = \
+sources = \
+    threads_qthreads.h \
     threads_qthreads_component.c \
-    threads_qthreads_mutex.c \
     threads_qthreads_condition.c \
-    threads_qthreads_module.c
+    threads_qthreads_module.c \
+    threads_qthreads_mutex.c \
+    threads_qthreads_mutex.h \
+    threads_qthreads_threads.h \
+    threads_qthreads_tsd.h \
+    threads_qthreads_wait_sync.h
+
+lib_sources = $(sources)
+
+if MCA_BUILD_opal_threads_qthreads_DSO
+component_noinst =
+component_install = mca_threads_qthreads.la
+else
+component_noinst = libmca_threads_qthreads.la
+component_install =
+endif
+
+mcacomponentdir = $(opallibdir)
+mcacomponent_LTLIBRARIES = $(component_install)
+mca_threads_qthreads_la_SOURCES = $(sources)
+mca_threads_qthreads_la_LDFLAGS = -module -avoid-version
+mca_threads_qthreads_la_LIBADD = $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
+        $(opal_qthreads_LIBS)
 
-AM_LDFLAGS = -lqthread
+noinst_LTLIBRARIES = $(component_noinst)
+libmca_threads_qthreads_la_SOURCES = $(sources)
+libmca_threads_qthreads_la_LDFLAGS = -module -avoid-version $(opal_qthreads_LDFLAGS)
+libmca_threads_qthreads_la_LIBADD = $(opal_qthreads_LIBS)

opal/mca/threads/qthreads/configure.m4

@@ -31,7 +31,68 @@ AC_DEFUN([OPAL_CONFIG_QTHREADS],[
                                     [threads_qthreads_happy="no"])],
                      [threads_qthreads_happy="no"])
 
-    AS_IF([test "$threads_qthreads_happy" = "yes"],
+    AC_ARG_WITH([qthreads],
+                [AC_HELP_STRING([--with-qthreads=DIR],
+                                [Specify location of qthreads installation.  Error if qthreads support cannot be found.])])
+
+    AC_ARG_WITH([qthreads-libdir],
+                [AC_HELP_STRING([--with-qthreads-libdir=DIR],
+                                [Search for qthreads libraries in DIR])])
+
+    opal_check_qthreads_save_CPPFLAGS=$CPPFLAGS
+    opal_check_qthreads_save_LDFLAGS=$LDFLAGS
+    opal_check_qthreads_save_LIBS=$LIBS
+
+    opal_qthreads_happy=yes
+    AS_IF([test "$with_qthreads" = "no"],
+          [opal_qthreads_happy=no])
+
+    AS_IF([test $opal_qthreads_happy = yes],
+          [AC_MSG_CHECKING([looking for qthreads in])
+           AS_IF([test "$with_qthreads" != "yes"],
+                 [opal_qthreads_dir=$with_qthreads
+                  AC_MSG_RESULT([($opal_qthreads_dir)])],
+                 [AC_MSG_RESULT([(default search paths)])])
+           AS_IF([test ! -z "$with_qthreads_libdir" && \
+                         test "$with_qthreads_libdir" != "yes"],
+                 [opal_qthreads_libdir=$with_qthreads_libdir])
+          ])
+
+    AS_IF([test $opal_qthreads_happy = yes],
+          [OPAL_CHECK_PACKAGE([opal_qthreads],
+                              [qthread/qthread.h],
+                              [qthread],
+                              [qthread_initialize],
+                              [],
+                              [$opal_qthreads_dir],
+                              [$opal_qthreads_libdir],
+                              [],
+                              [opal_qthreads_happy=no])])
+
+    AS_IF([test $opal_qthreads_happy = yes && test -n "$opal_qthreads_dir"],
+          [OPAL_QTHREADS_INCLUDE_PATH="$opal_qthreads_dir/include/"],
+          [OPAL_QTHREADS_INCLUDE_PATH=""])
+
+    AS_IF([test $opal_qthreads_happy = yes],
+          [TPKG_CFLAGS="$opal_qthreads_CPPFLAGS"
+           TPKG_FCFLAGS="$opal_qthreads_CPPFLAGS"
+           TPKG_CXXFLAGS="$opal_qthreads_CPPFLAGS"
+           TPKG_CPPFLAGS="$opal_qthreads_CPPFLAGS"
+           TPKG_CXXCPPFLAGS="$opal_qthreads_CPPFLAGS"
+           TPKG_LDFLAGS="$opal_qthreads_LDFLAGS"
+           TPKG_LIBS="$opal_qthreads_LIBS"])
+
+    AC_CONFIG_FILES([opal/mca/threads/qthreads/threads_qthreads.h])
+    AC_SUBST([OPAL_QTHREADS_INCLUDE_PATH])
+    AC_SUBST([opal_qthreads_CPPFLAGS])
+    AC_SUBST([opal_qthreads_LDFLAGS])
+    AC_SUBST([opal_qthreads_LIBS])
+
+    CPPFLAGS=$opal_check_qthreads_save_CPPFLAGS
+    LDFLAGS=$opal_check_qthreads_save_LDFLAGS
+    LIBS=$opal_check_qthreads_save_LIBS
+
+    AS_IF([test "$opal_qthreads_happy" = "yes"],
           [$1],
           [$2])
 ])dnl
@@ -60,7 +121,22 @@ AC_DEFUN([MCA_opal_threads_qthreads_POST_CONFIG],[
            AC_DEFINE_UNQUOTED([MCA_threads_wait_sync_base_include_HEADER],
                               ["opal/mca/threads/qthreads/threads_qthreads_wait_sync.h"],
                               [Header to include for wait_sync implementation])
+           THREAD_CFLAGS="$TPKG_CFLAGS"
+           THREAD_FCFLAGS="$TPKG_FCFLAGS"
+           THREAD_CXXFLAGS="$TPKG_CXXFLAGS"
+           THREAD_CPPFLAGS="$TPKG_CPPFLAGS"
+           THREAD_CXXCPPFLAGS="$TPKG_CXXCPPFLAGS"
+           THREAD_LDFLAGS="$TPKG_LDFLAGS"
+           THREAD_LIBS="$TPKG_LIBS"
+           LIBS="$LIBS $THREAD_LIBS"
+           LDFLAGS="$LDFLAGS $THREAD_LDFLAGS"
          ])
+    AC_SUBST(THREAD_CFLAGS)
+    AC_SUBST(THREAD_FCFLAGS)
+    AC_SUBST(THREAD_CXXFLAGS)
+    AC_SUBST(THREAD_CPPFLAGS)
+    AC_SUBST(THREAD_LDFLAGS)
+    AC_SUBST(THREAD_LIBS)
 ])dnl
 
 

opal/mca/threads/qthreads/threads_qthreads.h renamed to opal/mca/threads/qthreads/threads_qthreads.h.in

@@ -26,7 +26,7 @@
 #ifndef OPAL_MCA_THREADS_QTHREADS_THREADS_QTHREADS_H
 #define OPAL_MCA_THREADS_QTHREADS_THREADS_QTHREADS_H 1
 
-#include <qthread/qthread.h>
+#include "@OPAL_QTHREADS_INCLUDE_PATH@qthread/qthread.h"
 
 static inline void ensure_init_qthreads(void)
 {

opal/mca/threads/qthreads/threads_qthreads_mutex.h

@@ -48,8 +48,6 @@
 #include "opal/sys/atomic.h"
 #include "opal/util/output.h"
 
-#include <qthread/qthread.h>
-
 BEGIN_C_DECLS
 
 struct opal_mutex_t {

opal/mca/threads/qthreads/threads_qthreads_threads.h

@@ -26,7 +26,6 @@
 #ifndef OPAL_MCA_THREADS_QTHREADS_THREADS_QTHREADS_THREADS_H
 #define OPAL_MCA_THREADS_QTHREADS_THREADS_QTHREADS_THREADS_H 1
 
-#include <qthread/qthread.h>
 #include <signal.h>
 
 struct opal_thread_t {

opal/mca/threads/qthreads/threads_qthreads_tsd.h

@@ -28,8 +28,6 @@
 #define OPAL_MCA_THREADS_QTHREADS_THREADS_QTHREADS_TSD_H 1
 
 #include "opal/mca/threads/qthreads/threads_qthreads.h"
-#include <qthread/qthread.h>
-#include <qthread/tls.h>
 
 typedef qthread_key_t opal_tsd_key_t;