CI linkage fixes (4)

Update Boost.WinAPI usage to the new location and namespace

.travis.yml

@@ -2,7 +2,7 @@
 # subject to the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 #
-# Copyright Antony Polukhin 2014-2016.
+# Copyright Antony Polukhin 2014-2018.
 
 #
 # See https://svn.boost.org/trac/boost/wiki/TravisCoverals for description of this file
@@ -90,7 +90,7 @@ before_install:
 
 script:
     # `--coverage` flags required to generate coverage info for Coveralls
-    - ../../../b2 -a "testing.launcher=LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.3 " address-model=64 architecture=x86 toolset=$TOOLSET cxxflags="--coverage -fsanitize=address,leak,undefined -DBOOST_TRAVISCI_BUILD $CXX_FLAGS" linkflags="$LINK_FLAGS --coverage -lasan -lubsan"
+    - ../../../b2 -a "testing.launcher=LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.3 " address-model=64 architecture=x86 toolset=$TOOLSET cxxflags="--coverage -fsanitize=address,undefined -DBOOST_TRAVISCI_BUILD $CXX_FLAGS" linkflags="$LINK_FLAGS --coverage -lasan -lubsan"
     - ../../../b2 -a address-model=64 architecture=x86 toolset=$TOOLSET cxxflags="-fsanitize=thread -DBOOST_TRAVISCI_BUILD $CXX_FLAGS" linkflags="$LINK_FLAGS -ltsan"
 
 after_success:

build/Jamfile.v2

@@ -51,6 +51,8 @@ explicit WinDbg ;
 mp-run-simple has_windbg_cached.cpp : : : <library>Dbgeng <library>ole32 : WinDbgCached ;
 explicit WinDbgCached ;
 
+local libraries ;
+
 lib boost_stacktrace_noop
   : # sources
     ../src/noop.cpp
@@ -62,7 +64,7 @@ lib boost_stacktrace_noop
     #<link>shared:<define>BOOST_STACKTRACE_DYN_LINK=1
   ;
 
-boost-install boost_stacktrace_noop ;
+libraries += boost_stacktrace_noop ;
 
 lib boost_stacktrace_backtrace
   : # sources
@@ -78,7 +80,7 @@ lib boost_stacktrace_backtrace
     #<link>shared:<define>BOOST_STACKTRACE_DYN_LINK=1
   ;
 
-boost-install boost_stacktrace_backtrace ;
+libraries += boost_stacktrace_backtrace ;
 
 lib boost_stacktrace_addr2line
   : # sources
@@ -93,7 +95,7 @@ lib boost_stacktrace_addr2line
     #<link>shared:<define>BOOST_STACKTRACE_DYN_LINK=1
   ;
 
-boost-install boost_stacktrace_addr2line ;
+libraries += boost_stacktrace_addr2line ;
 
 lib boost_stacktrace_basic
   : # sources
@@ -108,7 +110,7 @@ lib boost_stacktrace_basic
     #<link>shared:<define>BOOST_STACKTRACE_DYN_LINK=1
   ;
 
-boost-install boost_stacktrace_basic ;
+libraries += boost_stacktrace_basic ;
 
 lib boost_stacktrace_windbg
   : # sources
@@ -123,7 +125,7 @@ lib boost_stacktrace_windbg
     #<link>shared:<define>BOOST_STACKTRACE_DYN_LINK=1
   ;
 
-boost-install boost_stacktrace_windbg ;
+libraries += boost_stacktrace_windbg ;
 
 lib boost_stacktrace_windbg_cached
   : # sources
@@ -138,5 +140,6 @@ lib boost_stacktrace_windbg_cached
     #<link>shared:<define>BOOST_STACKTRACE_DYN_LINK=1
   ;
 
-boost-install boost_stacktrace_windbg_cached ;
+libraries += boost_stacktrace_windbg_cached ;
 
+boost-install $(libraries) ;

build/has_windbg_cached.cpp

@@ -18,7 +18,7 @@
 int foo() {
     static thread_local std::string i = std::string();
     
-    return i.size();
+    return static_cast<int>(i.size());
 }
 
 int main() {

doc/stacktrace.qbk

@@ -67,6 +67,8 @@ Segmentation Faults and `std::terminate` calls sometimes happen in programs. Pro
 
 [warning Writing a signal handler requires high attention! Only a few system calls allowed in signal handlers, so there's no cross platform way to print a stacktrace without a risk of deadlocking. The only way to deal with the problem - [*dump raw stacktrace into file/socket and parse it on program restart].]
 
+[warning Not all the platforms provide means for even getting stacktrace in async signal safe way. No stack trace will be saved on such platforms. ]
+
 Let's write a handler to safely dump stacktrace:
 
 [getting_started_terminate_handlers]

example/debug_function.cpp

@@ -1,4 +1,4 @@
-// Copyright Antony Polukhin, 2016-2017.
+// Copyright Antony Polukhin, 2016-2018.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -28,8 +28,6 @@ void my_signal_handler(int /*signum*/) {
 int main() {
     ::signal(SIGSEGV, &my_signal_handler);
     print_signal_handler_and_exit();
-    
-    return 2;
 }
 
 

example/terminate_handler.cpp

@@ -1,4 +1,4 @@
-// Copyright Antony Polukhin, 2016-2017.
+// Copyright Antony Polukhin, 2016-2018.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -271,6 +271,13 @@ int test_inplace() {
 
         boost::filesystem::remove("./backtrace3.dump");
 
+#ifdef BOOST_WINDOWS
+        // `ss2` could be empty on some combinations of Windows+MSVC.
+        if (!ss2) {
+            return 0;
+        }
+#endif
+
         if (ss1.size() != ss2.size()) {
             std::cerr << "Stacktraces differ:\n" << ss1 << "\n vs \n" << ss2 << '\n';
             return 58;
@@ -293,12 +300,12 @@ int test_inplace() {
 
 int main(int argc, const char* argv[]) {
     if (argc < 2) {
+#ifndef BOOST_WINDOWS
         // We are copying files to make sure that stacktrace printing works independently from executable name
         copy_and_run(argv[0], '1', true);
         copy_and_run(argv[0], '2', false);
 
-#ifndef BOOST_WINDOWS
-        // There are some issues with async-safety of shared mmory writes on Windows.
+        // There are some issues with async-safety of shared memory writes on Windows.
         copy_and_run(argv[0], '3', true);
         copy_and_run(argv[0], '4', false);
 #endif

example/throwing_st.cpp

@@ -1,4 +1,4 @@
-// Copyright Antony Polukhin, 2016-2017.
+// Copyright Antony Polukhin, 2016-2018.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -68,8 +68,8 @@ int main() {
         std::cerr << e.what() << '\n';
         const boost::stacktrace::stacktrace* st = boost::get_error_info<traced>(e);
         if (st) {
-            std::cerr << *st << '\n'; /*<-*/ std::exit(0); /*->*/
-        } /*<-*/ std::exit(3); /*->*/
+            std::cerr << *st << '\n'; /*<-*/ return 0; /*->*/
+        } /*<-*/ return 3; /*->*/
     }
     //]
 

include/boost/stacktrace/detail/collect_msvc.ipp

@@ -14,15 +14,15 @@
 
 #include <boost/stacktrace/safe_dump_to.hpp>
 
-#include <boost/detail/winapi/stack_backtrace.hpp>
+#include <boost/winapi/stack_backtrace.hpp>
 
 namespace boost { namespace stacktrace { namespace detail {
 
 std::size_t this_thread_frames::collect(native_frame_ptr_t* out_frames, std::size_t max_frames_count, std::size_t skip) BOOST_NOEXCEPT {
-    return boost::detail::winapi::RtlCaptureStackBackTrace(
-        static_cast<boost::detail::winapi::ULONG_>(skip),
-        static_cast<boost::detail::winapi::ULONG_>(max_frames_count),
-        const_cast<boost::detail::winapi::PVOID_*>(out_frames),
+    return boost::winapi::RtlCaptureStackBackTrace(
+        static_cast<boost::winapi::ULONG_>(skip),
+        static_cast<boost::winapi::ULONG_>(max_frames_count),
+        const_cast<boost::winapi::PVOID_*>(out_frames),
         0
     );
 }

include/boost/stacktrace/detail/frame_msvc.ipp

@@ -21,8 +21,6 @@
 #include <windows.h>
 #include "dbgeng.h"
 
-#include <boost/detail/winapi/get_current_process.hpp>
-
 #ifdef BOOST_MSVC
 #   pragma comment(lib, "ole32.lib")
 #   pragma comment(lib, "Dbgeng.lib")
@@ -59,7 +57,7 @@ public:
         //
         // If we call CoInitializeEx befire user - user may end up with different mode, which is a problem.
         // So we need to call that initialization function as late as possible.
-        const boost::detail::winapi::DWORD_ res = ::CoInitializeEx(0, COINIT_MULTITHREADED);
+        const DWORD res = ::CoInitializeEx(0, COINIT_MULTITHREADED);
         ok_ = (res == S_OK || res == S_FALSE);
     }
 
@@ -100,7 +98,7 @@ public:
 };
 
 
-static std::string minwg_demangling_workaround(const std::string& s) {
+static std::string mingw_demangling_workaround(const std::string& s) {
 #ifdef BOOST_GCC
     if (s.empty()) {
         return s;
@@ -239,7 +237,7 @@ public:
             return result;
         }
 
-        result = minwg_demangling_workaround(
+        result = mingw_demangling_workaround(
             result.substr(delimiter + 1)
         );
 

include/boost/stacktrace/detail/location_from_symbol.hpp

@@ -15,7 +15,7 @@
 #if !defined(BOOST_WINDOWS) && !defined(__CYGWIN__)
 #   include <dlfcn.h>
 #else
-#   include <boost/detail/winapi/dll.hpp>
+#   include <boost/winapi/dll.hpp>
 #endif
 
 namespace boost { namespace stacktrace { namespace detail {
@@ -52,20 +52,20 @@ public:
 #else
 
 class location_from_symbol {
-    BOOST_STATIC_CONSTEXPR boost::detail::winapi::DWORD_ DEFAULT_PATH_SIZE_ = 260;
+    BOOST_STATIC_CONSTEXPR boost::winapi::DWORD_ DEFAULT_PATH_SIZE_ = 260;
     char file_name_[DEFAULT_PATH_SIZE_];
 
 public:
     explicit location_from_symbol(const void* addr) BOOST_NOEXCEPT {
         file_name_[0] = '\0';
 
-        boost::detail::winapi::MEMORY_BASIC_INFORMATION_ mbi;
-        if (!boost::detail::winapi::VirtualQuery(addr, &mbi, sizeof(mbi))) {
+        boost::winapi::MEMORY_BASIC_INFORMATION_ mbi;
+        if (!boost::winapi::VirtualQuery(addr, &mbi, sizeof(mbi))) {
             return;
         }
 
-        boost::detail::winapi::HMODULE_ handle = reinterpret_cast<boost::detail::winapi::HMODULE_>(mbi.AllocationBase);
-        if (!boost::detail::winapi::GetModuleFileNameA(handle, file_name_, DEFAULT_PATH_SIZE_)) {
+        boost::winapi::HMODULE_ handle = reinterpret_cast<boost::winapi::HMODULE_>(mbi.AllocationBase);
+        if (!boost::winapi::GetModuleFileNameA(handle, file_name_, DEFAULT_PATH_SIZE_)) {
             file_name_[0] = '\0';
             return;
         }
@@ -81,15 +81,15 @@ public:
 };
 
 class program_location {
-    BOOST_STATIC_CONSTEXPR boost::detail::winapi::DWORD_ DEFAULT_PATH_SIZE_ = 260;
+    BOOST_STATIC_CONSTEXPR boost::winapi::DWORD_ DEFAULT_PATH_SIZE_ = 260;
     char file_name_[DEFAULT_PATH_SIZE_];
 
 public:
     program_location() BOOST_NOEXCEPT {
         file_name_[0] = '\0';
 
-        const boost::detail::winapi::HMODULE_ handle = 0;
-        if (!boost::detail::winapi::GetModuleFileNameA(handle, file_name_, DEFAULT_PATH_SIZE_)) {
+        const boost::winapi::HMODULE_ handle = 0;
+        if (!boost::winapi::GetModuleFileNameA(handle, file_name_, DEFAULT_PATH_SIZE_)) {
             file_name_[0] = '\0';
         }
     }

include/boost/stacktrace/detail/safe_dump_win.ipp

@@ -1,4 +1,4 @@
-// Copyright Antony Polukhin, 2016-2017.
+// Copyright Antony Polukhin, 2016-2018.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -16,43 +16,49 @@
 
 #include <boost/core/noncopyable.hpp>
 
-#include <boost/detail/winapi/get_current_process.hpp>
-#include <boost/detail/winapi/file_management.hpp>
-#include <boost/detail/winapi/handles.hpp>
-#include <boost/detail/winapi/access_rights.hpp>
+#include <boost/winapi/get_current_process.hpp>
+#include <boost/winapi/file_management.hpp>
+#include <boost/winapi/handles.hpp>
+#include <boost/winapi/access_rights.hpp>
 
 namespace boost { namespace stacktrace { namespace detail {
 
-std::size_t dump(void* fd, const native_frame_ptr_t* frames, std::size_t frames_count) BOOST_NOEXCEPT {
-    boost::detail::winapi::DWORD_ written;
-    const boost::detail::winapi::DWORD_ bytes_to_write = static_cast<boost::detail::winapi::DWORD_>(
+std::size_t dump(void* /*fd*/, const native_frame_ptr_t* /*frames*/, std::size_t /*frames_count*/) BOOST_NOEXCEPT {
+#if 0 // This code potentially could cause deadlocks (according to the MSDN). Disabled
+    boost::winapi::DWORD_ written;
+    const boost::winapi::DWORD_ bytes_to_write = static_cast<boost::winapi::DWORD_>(
         sizeof(native_frame_ptr_t) * frames_count
     );
-    if (!boost::detail::winapi::WriteFile(fd, frames, bytes_to_write, &written, 0)) {
+    if (!boost::winapi::WriteFile(fd, frames, bytes_to_write, &written, 0)) {
         return 0;
     }
 
     return frames_count;
+#endif
+    return 0;
 }
 
-std::size_t dump(const char* file, const native_frame_ptr_t* frames, std::size_t frames_count) BOOST_NOEXCEPT {
-    void* const fd = boost::detail::winapi::CreateFileA(
+std::size_t dump(const char* /*file*/, const native_frame_ptr_t* /*frames*/, std::size_t /*frames_count*/) BOOST_NOEXCEPT {
+#if 0 // This code causing deadlocks on some platforms. Disabled
+    void* const fd = boost::winapi::CreateFileA(
         file,
-        boost::detail::winapi::GENERIC_WRITE_,
+        boost::winapi::GENERIC_WRITE_,
         0,
         0,
-        boost::detail::winapi::CREATE_ALWAYS_,
-        boost::detail::winapi::FILE_ATTRIBUTE_NORMAL_,
+        boost::winapi::CREATE_ALWAYS_,
+        boost::winapi::FILE_ATTRIBUTE_NORMAL_,
         0
     );
 
-    if (fd == boost::detail::winapi::invalid_handle_value) {
+    if (fd == boost::winapi::invalid_handle_value) {
         return 0;
     }
 
     const std::size_t size = boost::stacktrace::detail::dump(fd, frames, frames_count);
-    boost::detail::winapi::CloseHandle(fd);
+    boost::winapi::CloseHandle(fd);
     return size;
+#endif
+    return 0;
 }
 
 }}} // namespace boost::stacktrace::detail

include/boost/stacktrace/safe_dump_to.hpp

@@ -12,7 +12,10 @@
 #   pragma once
 #endif
 
-#include <boost/detail/winapi/config.hpp>
+#if defined(BOOST_WINDOWS)
+#include <boost/winapi/config.hpp>
+#endif
+
 #include <boost/stacktrace/detail/push_options.h>
 
 #ifdef BOOST_INTEL
@@ -108,7 +111,7 @@ BOOST_FORCEINLINE std::size_t safe_dump_to(std::size_t skip, void* memory, std::
 }
 
 
-/// @brief Opens a file and rewrites its content with current function call sequence.
+/// @brief Opens a file and rewrites its content with current function call sequence if such operations are async signal safe.
 ///
 /// @b Complexity: O(N) where N is call sequence length, O(1) if BOOST_STACKTRACE_USE_NOOP is defined.
 ///
@@ -121,7 +124,7 @@ BOOST_FORCEINLINE std::size_t safe_dump_to(const char* file) BOOST_NOEXCEPT {
     return boost::stacktrace::detail::this_thread_frames::safe_dump_to_impl(file, 0, boost::stacktrace::detail::max_frames_dump);
 }
 
-/// @brief Opens a file and rewrites its content with current function call sequence.
+/// @brief Opens a file and rewrites its content with current function call sequence if such operations are async signal safe.
 ///
 /// @b Complexity: O(N) where N is call sequence length, O(1) if BOOST_STACKTRACE_USE_NOOP is defined.
 ///
@@ -140,7 +143,7 @@ BOOST_FORCEINLINE std::size_t safe_dump_to(std::size_t skip, std::size_t max_dep
 
 #ifdef BOOST_STACKTRACE_DOXYGEN_INVOKED
 
-/// @brief Writes into the provided file descriptor the current function call sequence.
+/// @brief Writes into the provided file descriptor the current function call sequence if such operation is async signal safe.
 ///
 /// @b Complexity: O(N) where N is call sequence length, O(1) if BOOST_STACKTRACE_USE_NOOP is defined.
 ///
@@ -151,7 +154,7 @@ BOOST_FORCEINLINE std::size_t safe_dump_to(std::size_t skip, std::size_t max_dep
 /// @param file File to store current function call sequence.
 BOOST_FORCEINLINE std::size_t safe_dump_to(platform_specific_descriptor fd) BOOST_NOEXCEPT;
 
-/// @brief Writes into the provided file descriptor the current function call sequence.
+/// @brief Writes into the provided file descriptor the current function call sequence if such operation is async signal safe.
 ///
 /// @b Complexity: O(N) where N is call sequence length, O(1) if BOOST_STACKTRACE_USE_NOOP is defined.
 ///

include/boost/stacktrace/stacktrace.hpp

@@ -13,6 +13,7 @@
 #endif
 
 #include <boost/core/explicit_operator_bool.hpp>
+#include <boost/container_hash/hash_fwd.hpp>
 
 #include <iosfwd>
 #include <string>
@@ -31,13 +32,6 @@
 #   pragma warning(disable:2196) // warning #2196: routine is both "inline" and "noinline"
 #endif
 
-/// @cond
-namespace boost {
-    // Forward declaration
-    template <class It> std::size_t hash_range(It, It);
-}
-/// @endcond
-
 namespace boost { namespace stacktrace {
 
 /// Class that on construction copies minimal information about call stack into its internals and provides access to that information.
@@ -87,7 +81,11 @@ class basic_stacktrace {
             }
 
             // Failed to fit in `buffer_size`. Allocating memory:
+#ifdef BOOST_NO_CXX11_ALLOCATOR
             typedef typename Allocator::template rebind<native_frame_ptr_t>::other allocator_void_t;
+#else
+            typedef typename std::allocator_traits<Allocator>::template rebind_alloc<native_frame_ptr_t> allocator_void_t;
+#endif
             std::vector<native_frame_ptr_t, allocator_void_t> buf(buffer_size * 2, 0, impl_.get_allocator());
             do {
                 const std::size_t frames_count = boost::stacktrace::detail::this_thread_frames::collect(&buf[0], buf.size(), frames_to_skip + 1);

test/Jamfile.v2

@@ -1,4 +1,4 @@
-#  Copyright (C) 2016-2017, Antony Polukhin.
+#  Copyright (C) 2016-2018, Antony Polukhin.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -24,6 +24,7 @@ project
   : requirements
     <toolset>msvc:<asynch-exceptions>on
     <toolset>intel:<cxxflags>-wd2196
+    <target-os>linux:<linkflags>-lpthread
     <warnings>all
     <test-info>always_show_run_output
   ;
@@ -135,25 +136,49 @@ test-suite stacktrace_tests
 
     # Thread safety without debug symbols
     [ run thread_safety_checking.cpp
-        : : : <debug-symbols>off <library>/boost/thread//boost_thread <library>/boost/timer//boost_timer <library>.//test_impl_lib_backtrace_no_dbg     $(LINKSHARED_BT)
+        : : : <debug-symbols>off
+            <library>/boost/thread//boost_thread
+            <library>/boost/timer//boost_timer
+            <library>.//test_impl_lib_backtrace_no_dbg
+            $(LINKSHARED_BT)
         : backtrace_lib_no_dbg_threaded ]
     [ run thread_safety_checking.cpp
-        : : : <debug-symbols>off <library>/boost/thread//boost_thread <library>/boost/timer//boost_timer <library>.//test_impl_lib_windbg_no_dbg        $(LINKSHARED_WIND)
+        : : : <debug-symbols>off
+            <library>/boost/thread//boost_thread
+            <library>/boost/timer//boost_timer
+            <library>.//test_impl_lib_windbg_no_dbg
+            $(LINKSHARED_WIND)
         : windbg_lib_no_dbg_threaded ]
     [ run thread_safety_checking.cpp
-        : : : <debug-symbols>off <library>/boost/thread//boost_thread <library>/boost/timer//boost_timer <library>.//test_impl_lib_windbg_cached_no_dbg $(LINKSHARED_WIND_CACHED)
+        : : : <debug-symbols>off
+            <library>/boost/thread//boost_thread
+            <library>/boost/timer//boost_timer
+            <library>.//test_impl_lib_windbg_cached_no_dbg
+            $(LINKSHARED_WIND_CACHED)
         : windbg_cached_lib_no_dbg_threaded ]
     [ run thread_safety_checking.cpp
-        : : : <debug-symbols>off <library>/boost/thread//boost_thread <library>/boost/timer//boost_timer <library>.//test_impl_lib_basic_no_dbg         $(LINKSHARED_BASIC)
+        : : : <debug-symbols>off
+            <library>/boost/thread//boost_thread
+            <library>/boost/timer//boost_timer
+            <library>.//test_impl_lib_basic_no_dbg
+            $(LINKSHARED_BASIC)
         : basic_lib_no_dbg_threaded ]
 
     [ run thread_safety_checking.cpp
-        : : : <debug-symbols>off <library>/boost/thread//boost_thread <library>/boost/timer//boost_timer <library>.//test_impl_lib_windbg
-            $(LINKSHARED_WIND) <define>BOOST_STACKTRACE_TEST_COM_PREINIT_MT
+        : : : <debug-symbols>off
+            <library>/boost/thread//boost_thread
+            <library>/boost/timer//boost_timer
+            <library>.//test_impl_lib_windbg
+            $(LINKSHARED_WIND)
+            <define>BOOST_STACKTRACE_TEST_COM_PREINIT_MT
         : windbg_lib_threaded_com_mt ]
     [ run thread_safety_checking.cpp
-        : : : <debug-symbols>off <library>/boost/thread//boost_thread <library>/boost/timer//boost_timer <library>.//test_impl_lib_windbg_cached
-            $(LINKSHARED_WIND_CACHED) <define>BOOST_STACKTRACE_TEST_COM_PREINIT_ST
+        : : : <debug-symbols>off
+            <library>/boost/thread//boost_thread
+            <library>/boost/timer//boost_timer
+            <library>.//test_impl_lib_windbg_cached
+            $(LINKSHARED_WIND_CACHED)
+            <define>BOOST_STACKTRACE_TEST_COM_PREINIT_ST
         : windbg_cached_lib_threaded_com_st ]
 
     [ run test_void_ptr_cast.cpp ]