Revert pull request lballabio#1491.

Author: lballabio

CMakeLists.txt

@@ -125,7 +125,15 @@ if (NOT DEFINED QL_BOOST_VERSION)
     endif()
 endif()
 
-find_package(Boost ${QL_BOOST_VERSION} REQUIRED)
+if (NOT DEFINED QL_BOOST_COMPONENTS)
+    set(QL_BOOST_COMPONENTS "")
+    # Boost thread needed for sessions, singleton thread-safe init and thread-safe observer pattern
+    if(QL_ENABLE_SESSIONS OR QL_ENABLE_SINGLETON_THREAD_SAFE_INIT OR QL_ENABLE_THREAD_SAFE_OBSERVER_PATTERN)
+        set(QL_BOOST_COMPONENTS "${QL_BOOST_COMPONENTS};thread")
+    endif()
+endif()
+
+find_package(Boost ${QL_BOOST_VERSION} REQUIRED COMPONENTS ${QL_BOOST_COMPONENTS})
 
 # Do not warn about Boost versions higher than 1.58.0
 set(Boost_NO_WARN_NEW_VERSIONS ON)
@@ -142,18 +150,22 @@ if (NOT DEFINED THREADS_PREFER_PTHREAD_FLAG)
     set(THREADS_PREFER_PTHREAD_FLAG ON)
 endif()
 
-# Add Threads dependency when any of the threading features are enabled
-if (QL_ENABLE_PARALLEL_UNIT_TEST_RUNNER OR QL_ENABLE_SESSIONS OR QL_ENABLE_SINGLETON_THREAD_SAFE_INIT OR QL_ENABLE_THREAD_SAFE_OBSERVER_PATTERN)
+set(QL_THREAD_LIBRARIES)
+
+if (QL_ENABLE_PARALLEL_UNIT_TEST_RUNNER)
     find_package(Threads REQUIRED)
+    set(QL_THREAD_LIBRARIES Threads::Threads ${QL_THREAD_LIBRARIES})
     # Parallel test runner needs library rt on *nix for shm_open, etc.
-    if (QL_ENABLE_PARALLEL_UNIT_TEST_RUNNER AND UNIX AND NOT APPLE)
+    if (UNIX AND NOT APPLE)
         find_library(RT_LIBRARY rt REQUIRED)
-        set(QL_THREAD_LIBRARIES Threads::Threads ${RT_LIBRARY})
-    else()
-        set(QL_THREAD_LIBRARIES Threads::Threads)
+        set(QL_THREAD_LIBRARIES ${RT_LIBRARY} ${QL_THREAD_LIBRARIES})
     endif()
 endif()
 
+if (QL_ENABLE_SESSIONS OR QL_ENABLE_SINGLETON_THREAD_SAFE_INIT OR QL_ENABLE_THREAD_SAFE_OBSERVER_PATTERN)
+    set(QL_THREAD_LIBRARIES Boost::thread ${QL_THREAD_LIBRARIES})
+endif()
+
 # If available, use PIC for shared libs and PIE for executables
 if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
     set(CMAKE_POSITION_INDEPENDENT_CODE ON)

Examples/Makefile.am

@@ -30,7 +30,7 @@ else
 noinst_PROGRAMS = $(EXAMPLES)
 endif
 
-LDADDS = ../ql/libQuantLib.la ${PTHREAD_LIB}
+LDADDS = ../ql/libQuantLib.la ${BOOST_THREAD_LIB}
 
 BasketLosses_BasketLosses_SOURCES = BasketLosses/BasketLosses.cpp
 BasketLosses_BasketLosses_LDADD = $(LDADDS)

acinclude.m4

@@ -153,38 +153,63 @@ AC_DEFUN([QL_CHECK_BOOST_UNIT_TEST],
  fi
 ])
 
-# QL_CHECK_BOOST_SIGNALS2
+# QL_CHECK_BOOST_TEST_THREAD_SIGNALS2_SYSTEM
 # ------------------------
-# Check whether Boost signals2 is available
-AC_DEFUN([QL_CHECK_BOOST_SIGNALS2],
-[AC_MSG_CHECKING([whether Boost signals2 is available])
+# Check whether the Boost thread and system is available
+AC_DEFUN([QL_CHECK_BOOST_TEST_THREAD_SIGNALS2_SYSTEM],
+[AC_MSG_CHECKING([whether Boost thread, signals2 and system are available])
  AC_REQUIRE([AC_PROG_CC])
  ql_original_LIBS=$LIBS
  ql_original_CXXFLAGS=$CXXFLAGS
- LIBS="$ql_original_LIBS -pthread"
- CXXFLAGS="$ql_original_CXXFLAGS -pthread"
- boost_signals2_found=no
- AC_LINK_IFELSE([AC_LANG_SOURCE(
-     [@%:@include <boost/signals2/signal.hpp>
-
-      int main() {
-        boost::signals2::signal<void()> sig;
-      }
-     ])],
-     [boost_signals2_found=yes
-      break],
-     [])
+ CC_BASENAME=`basename $CC`
+ CC_VERSION=`echo "__GNUC__ __GNUC_MINOR__" | $CC -E -x c - | tail -n 1 | $SED -e "s/ //"`
+ for suffix in "" \
+               "-$CC_BASENAME$CC_VERSION" \
+               "-$CC_BASENAME" \
+               "-mt-$CC_BASENAME$CC_VERSION" \
+               "-$CC_BASENAME$CC_VERSION-mt" \
+               "-x$CC_BASENAME$CC_VERSION-mt" \
+               "-mt-$CC_BASENAME" \
+               "-$CC_BASENAME-mt" \
+               "-mt" ; do
+     boost_thread_lib="-lboost_thread$suffix -lboost_system$suffix"
+     LIBS="$ql_original_LIBS $boost_thread_lib"
+     CXXFLAGS="$ql_original_CXXFLAGS -pthread"
+     boost_thread_found=no
+     AC_LINK_IFELSE([AC_LANG_SOURCE(
+         [@%:@include <boost/thread/locks.hpp>
+          @%:@include <boost/thread/recursive_mutex.hpp>
+          @%:@include <boost/signals2/signal.hpp>
+          
+          #ifndef BOOST_THREAD_PLATFORM_PTHREAD
+          #error only pthread is supported on this plattform
+          #endif
+    
+          int main() {
+            boost::recursive_mutex m;
+            boost::lock_guard<boost::recursive_mutex> lock(m);
+      
+            boost::signals2::signal<void()> sig;
+      
+            return 0;
+          }
+         ])],
+         [boost_thread_found=$boost_thread_lib
+          break],
+         [])
+ done
  LIBS="$ql_original_LIBS"
  CXXFLAGS="$ql_original_CXXFLAGS"
      
- if test "$boost_signals2_found" = no ; then
+ if test "$boost_thread_found" = no ; then
      AC_MSG_RESULT([no])
-     AC_SUBST([PTHREAD_LIB],[""])
-     AC_MSG_ERROR([Boost signals2 library not found.
-         This library is required by the thread-safe observer pattern.])
+     AC_SUBST([BOOST_THREAD_LIB],[""])
+     AC_MSG_ERROR([Boost thread, signals2 and system libraries not found. 
+         These libraries are required by the thread-safe observer pattern
+         or by the parallel unit test runner.])
  else
      AC_MSG_RESULT([yes])
-     AC_SUBST([PTHREAD_LIB],["-pthread"])
+     AC_SUBST([BOOST_THREAD_LIB],[$boost_thread_lib])
      AC_SUBST([PTHREAD_CXXFLAGS],["-pthread"])
      AC_SUBST([CXXFLAGS],["${CXXFLAGS} -pthread"])
  fi

configure.ac

@@ -41,6 +41,16 @@ if test [ -n "$ql_boost_include_path" ] ; then
    AC_SUBST([BOOST_INCLUDE],["-isystem ${ql_boost_include_path}"])
    AC_SUBST([CPPFLAGS],["${CPPFLAGS} -isystem ${ql_boost_include_path}"])
 fi
+AC_ARG_WITH([boost-lib],
+            AS_HELP_STRING([--with-boost-lib=LIB_PATH],
+                           [Supply the location of Boost libraries]),
+            [ql_boost_lib_path="`cd ${withval} 2>/dev/null && pwd`"],
+            [ql_boost_lib_path=""])
+if test [ -n "$ql_boost_lib_path" ] ; then
+   AC_SUBST([BOOST_LIB],["-L${ql_boost_lib_path}"])
+   AC_SUBST([LDFLAGS],["${LDFLAGS} -L${ql_boost_lib_path}"])
+fi
+
 
 # Continue setup
 
@@ -266,9 +276,9 @@ AC_MSG_RESULT([$ql_use_safe_singleton_init])
 
 if test "$ql_use_sessions" = "yes" || test "$ql_use_tsop" = "yes" || test "$ql_use_safe_singleton_init" = "yes"; then
    QL_CHECK_BOOST_VERSION_1_58_OR_HIGHER
-   QL_CHECK_BOOST_SIGNALS2
+   QL_CHECK_BOOST_TEST_THREAD_SIGNALS2_SYSTEM
 else
-   AC_SUBST([PTHREAD_LIB],[""])
+   AC_SUBST([BOOST_THREAD_LIB],[""])
 fi
 
 AC_MSG_CHECKING([whether to enable parallel unit test runner])

ql/CMakeLists.txt

@@ -2350,6 +2350,9 @@ target_include_directories(ql_library SYSTEM PUBLIC
     ${Boost_INCLUDE_DIRS}
     ${OpenMP_CXX_INCLUDE_DIRS})
 
+target_link_directories(ql_library PUBLIC
+    ${BOOST_LIBRARY_DIRS})
+
 target_link_libraries(ql_library PUBLIC
     ${OpenMP_CXX_LIBRARIES})
 

ql/auto_link.hpp

@@ -61,4 +61,15 @@
 #  pragma message("Will (need to) link to lib file: " QL_LIB_NAME)
 #endif
 
+/* Also, these Boost libraries might be needed */
+#if defined(QL_ENABLE_SESSIONS) || defined(QL_ENABLE_THREAD_SAFE_OBSERVER_PATTERN) || defined(QL_ENABLE_SINGLETON_THREAD_SAFE_INIT)
+#  define BOOST_LIB_NAME boost_system
+#  include <boost/config/auto_link.hpp>
+#  undef BOOST_LIB_NAME
+#  define BOOST_LIB_NAME boost_thread
+#  include <boost/config/auto_link.hpp>
+#  undef BOOST_LIB_NAME
+#endif
+
+
 #endif

ql/patterns/observable.cpp

@@ -97,7 +97,7 @@ namespace QuantLib {
           public:
             typedef boost::signals2::signal_type<
                 void(),
-                boost::signals2::keywords::mutex_type<std::recursive_mutex> >
+                boost::signals2::keywords::mutex_type<boost::recursive_mutex> >
                 ::type signal_type;
 
             void connect(const signal_type::slot_type& slot) {
@@ -140,7 +140,7 @@ namespace QuantLib {
 
     void Observable::registerObserver(const ext::shared_ptr<Observer::Proxy>& observerProxy) {
         {
-            std::lock_guard<std::recursive_mutex> lock(mutex_);
+            boost::lock_guard<boost::recursive_mutex> lock(mutex_);
             observers_.insert(observerProxy);
         }
 
@@ -155,12 +155,12 @@ namespace QuantLib {
     void Observable::unregisterObserver(const ext::shared_ptr<Observer::Proxy>& observerProxy,
                                         bool disconnect) {
         {
-            std::lock_guard<std::recursive_mutex> lock(mutex_);
+            boost::lock_guard<boost::recursive_mutex> lock(mutex_);
             observers_.erase(observerProxy);
         }
 
         if (settings_.updatesDeferred()) {
-            std::lock_guard<std::mutex> sLock(settings_.mutex_);
+            boost::lock_guard<boost::mutex> sLock(settings_.mutex_);
             if (settings_.updatesDeferred()) {
                 settings_.unregisterDeferredObserver(observerProxy);
             }
@@ -176,12 +176,12 @@ namespace QuantLib {
             return (*sig_)();
         }
 
-        std::lock_guard<std::mutex> sLock(settings_.mutex_);
+        boost::lock_guard<boost::mutex> sLock(settings_.mutex_);
         if (settings_.updatesEnabled()) {
             return (*sig_)();
         }
         else if (settings_.updatesDeferred()) {
-            std::lock_guard<std::recursive_mutex> lock(mutex_);
+            boost::lock_guard<boost::recursive_mutex> lock(mutex_);
             // if updates are only deferred, flag this for later notification
             // these are held centrally by the settings singleton
             settings_.registerDeferredObservers(observers_);