Update ci.yml

[skip ci] Add "cxxstd" json field

.github/workflows/ci.yml

@@ -29,13 +29,12 @@ jobs:
           - toolset: gcc-9
             os: ubuntu-20.04
           - toolset: gcc-11
-            os: ubuntu-20.04
-            install: g++-11
+            os: ubuntu-22.04
           - toolset: clang
-            compiler: clang++-12
+            compiler: clang++-14
             cxxstd: 20
-            os: ubuntu-20.04
-            install: clang-12
+            os: ubuntu-22.04
+            install: clang-14
           - toolset: clang
             os: macos-10.15
 

include/boost/thread/scoped_thread.hpp

@@ -14,6 +14,7 @@
 #include <boost/thread/detail/move.hpp>
 #include <boost/thread/thread_functors.hpp>
 #include <boost/thread/thread_only.hpp>
+#include <boost/thread/detail/thread_interruption.hpp>
 
 #include <boost/config/abi_prefix.hpp>
 
@@ -85,6 +86,10 @@ namespace boost
      */
     ~strict_scoped_thread()
     {
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+      // exceptions from a destructor call std::terminate
+      boost::this_thread::disable_interruption do_not_disturb;
+#endif
       CallableThread on_destructor;
 
       on_destructor(t_);
@@ -188,6 +193,10 @@ namespace boost
      */
     ~scoped_thread()
     {
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+      // exceptions from a destructor call std::terminate
+      boost::this_thread::disable_interruption do_not_disturb;
+#endif
       CallableThread on_destructor;
 
       on_destructor(t_);

include/boost/thread/thread_guard.hpp

@@ -12,6 +12,7 @@
 #include <boost/thread/detail/delete.hpp>
 #include <boost/thread/detail/move.hpp>
 #include <boost/thread/thread_functors.hpp>
+#include <boost/thread/detail/thread_interruption.hpp>
 
 #include <boost/config/abi_prefix.hpp>
 
@@ -34,6 +35,10 @@ namespace boost
     }
     ~thread_guard()
     {
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+      // exceptions from a destructor call std::terminate
+      boost::this_thread::disable_interruption do_not_disturb;
+#endif
       CallableThread on_destructor;
 
       on_destructor(t_);

meta/libraries.json

@@ -14,6 +14,7 @@
     "std": [ "proposal" ],    
     "category": [
       "Concurrent", "System"
-    ]
+    ],
+    "cxxstd": "03"
   }
 ]

src/win32/thread_primitives.cpp

@@ -52,7 +52,7 @@ struct get_tick_count64_state
 BOOST_ALIGNMENT(64) static get_tick_count64_state g_state;
 
 //! Artifical implementation of GetTickCount64
-ticks_type WINAPI get_tick_count64()
+ticks_type BOOST_WINAPI_WINAPI_CC get_tick_count64()
 {
     uint64_t old_state = g_state.ticks.load(boost::memory_order_acquire);
 
@@ -67,7 +67,7 @@ ticks_type WINAPI get_tick_count64()
 }
 
 //! The function is called periodically in the system thread pool to make sure g_state.ticks is timely updated
-void NTAPI refresh_get_tick_count64(boost::winapi::PVOID_, boost::winapi::BOOLEAN_)
+void BOOST_WINAPI_NTAPI_CC refresh_get_tick_count64(boost::winapi::PVOID_, boost::winapi::BOOLEAN_)
 {
     get_tick_count64();
 }
@@ -88,7 +88,7 @@ void cleanup_get_tick_count64()
     }
 }
 
-ticks_type WINAPI get_tick_count_init()
+ticks_type BOOST_WINAPI_WINAPI_CC get_tick_count_init()
 {
     boost::winapi::HMODULE_ hKernel32 = boost::winapi::GetModuleHandleW(L"kernel32.dll");
     if (hKernel32)

test/Jamfile.v2

@@ -368,6 +368,10 @@ rule generate_self_contained_header_tests
           [ thread-run test_10964.cpp ]
           [ thread-test test_11053.cpp ]
           [ thread-run test_11266.cpp ]
+          [ thread-run test_366_1.cpp ]
+          [ thread-run test_366_2.cpp ]
+          [ thread-run test_366_3.cpp ]
+          [ thread-run test_366_4.cpp ]
     ;
 
 

test/test_366_1.cpp

@@ -0,0 +1,37 @@
+// Copyright 2022 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include "boost/thread/thread_guard.hpp"
+#include "boost/thread.hpp"
+#include <boost/core/lightweight_test.hpp>
+#include <iostream>
+
+static void inner_thread_func()
+{
+    boost::this_thread::sleep_for(
+        boost::chrono::hours(1) );
+}
+
+static void outer_thread_func()
+{
+    boost::thread inner( inner_thread_func );
+    boost::thread_guard<boost::interrupt_and_join_if_joinable> guard( inner );
+}
+
+static void double_interrupt()
+{
+    boost::thread outer( outer_thread_func );
+    boost::thread_guard<boost::interrupt_and_join_if_joinable> guard( outer );
+}
+
+int main()
+{
+	BOOST_TEST( true ); // perform lwt initialization
+
+    std::cout << "Start" << std::endl;
+    double_interrupt();
+    std::cout << "End" << std::endl;
+
+	return boost::report_errors();
+}

test/test_366_2.cpp

@@ -0,0 +1,35 @@
+// Copyright 2022 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include "boost/thread/scoped_thread.hpp"
+#include "boost/thread.hpp"
+#include <boost/core/lightweight_test.hpp>
+#include <iostream>
+
+static void inner_thread_func()
+{
+    boost::this_thread::sleep_for(
+        boost::chrono::hours(1) );
+}
+
+static void outer_thread_func()
+{
+    boost::scoped_thread<boost::interrupt_and_join_if_joinable> inner( inner_thread_func );
+}
+
+static void double_interrupt()
+{
+    boost::scoped_thread<boost::interrupt_and_join_if_joinable> outer( outer_thread_func );
+}
+
+int main()
+{
+	BOOST_TEST( true ); // perform lwt initialization
+
+    std::cout << "Start" << std::endl;
+    double_interrupt();
+    std::cout << "End" << std::endl;
+
+	return boost::report_errors();
+}

test/test_366_3.cpp

@@ -0,0 +1,35 @@
+// Copyright 2022 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include "boost/thread/scoped_thread.hpp"
+#include "boost/thread.hpp"
+#include <boost/core/lightweight_test.hpp>
+#include <iostream>
+
+static void inner_thread_func()
+{
+    boost::this_thread::sleep_for(
+        boost::chrono::hours(1) );
+}
+
+static void outer_thread_func()
+{
+    boost::strict_scoped_thread<boost::interrupt_and_join_if_joinable> inner( inner_thread_func );
+}
+
+static void double_interrupt()
+{
+    boost::strict_scoped_thread<boost::interrupt_and_join_if_joinable> outer( outer_thread_func );
+}
+
+int main()
+{
+	BOOST_TEST( true ); // perform lwt initialization
+
+    std::cout << "Start" << std::endl;
+    double_interrupt();
+    std::cout << "End" << std::endl;
+
+	return boost::report_errors();
+}

test/test_366_4.cpp

@@ -0,0 +1,59 @@
+// Copyright 2022 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include "boost/thread/scoped_thread.hpp"
+#include "boost/thread.hpp"
+#include <boost/core/lightweight_test.hpp>
+#include <iostream>
+
+static void do_first_half()
+{
+    std::cout << "Doing first half of the work\n";
+
+    boost::this_thread::sleep_for(
+        boost::chrono::hours( 1 ) );
+
+    std::cout << "First half of the work complete\n";
+}
+
+static void do_second_half()
+{
+    std::cout << "Doing second half of the work\n";
+
+    boost::this_thread::sleep_for(
+        boost::chrono::hours( 1 ) );
+
+    std::cout << "Second half of the work complete\n";
+}
+
+static void outer_thread_func()
+{
+    boost::scoped_thread<boost::interrupt_and_join_if_joinable> worker1( do_first_half );
+    boost::scoped_thread<boost::interrupt_and_join_if_joinable> worker2( do_second_half );
+
+    worker1.join();
+    worker2.join();
+}
+
+int main()
+{
+    BOOST_TEST( true ); // perform lwt initialization
+
+    std::cout << "Start" << std::endl;
+
+    {
+        boost::thread outer( outer_thread_func );
+
+        boost::this_thread::sleep_for( boost::chrono::seconds( 1 ) );
+
+        std::cout << "Interrupting work\n";
+
+        outer.interrupt();
+        outer.join();
+    }
+
+    std::cout << "End" << std::endl;
+
+    return boost::report_errors();
+}