Merge pull request #336 from eldiener/develop

[skip ci] Add "cxxstd" json field
Remove all Windows jobs from ci.yml; the timeouts aren't sufficient and adjusting them all is too much work
2026-02-03 21:52:07 +00:00 · 2021-10-26 16:59:32 +03:00 · 2021-10-26 07:18:50 +03:00 · 2021-10-26 05:48:12 +03:00 · 2021-10-26 05:47:43 +03:00 · 2021-10-26 05:07:37 +03:00
5 changed files with 101 additions and 6 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,82 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - develop
+      - feature/**
+
+env:
+  UBSAN_OPTIONS: print_stacktrace=1
+
+jobs:
+  posix:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - toolset: gcc-4.8
+            os: ubuntu-18.04
+            install: g++-4.8
+          - toolset: gcc-5
+            cxxstd: 11
+            os: ubuntu-18.04
+            install: g++-5
+          - toolset: gcc-7
+            os: ubuntu-18.04
+          - toolset: gcc-9
+            os: ubuntu-20.04
+          - toolset: gcc-11
+            os: ubuntu-20.04
+            install: g++-11
+          - toolset: clang
+            compiler: clang++-12
+            cxxstd: 20
+            os: ubuntu-20.04
+            install: clang-12
+          - toolset: clang
+            os: macos-10.15
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install packages
+        if: matrix.install
+        run: sudo apt install ${{matrix.install}}
+
+      - name: Setup Boost
+        run: |
+          echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
+          LIBRARY=${GITHUB_REPOSITORY#*/}
+          echo LIBRARY: $LIBRARY
+          echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
+          echo GITHUB_BASE_REF: $GITHUB_BASE_REF
+          echo GITHUB_REF: $GITHUB_REF
+          REF=${GITHUB_BASE_REF:-$GITHUB_REF}
+          REF=${REF#refs/heads/}
+          echo REF: $REF
+          BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
+          echo BOOST_BRANCH: $BOOST_BRANCH
+          cd ..
+          git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
+          cd boost-root
+          cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
+          git submodule update --init tools/boostdep
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
+          ./bootstrap.sh
+          ./b2 -d0 headers
+
+      - name: Create user-config.jam
+        if: matrix.compiler
+        run: |
+          echo "using ${{matrix.toolset}} : : ${{matrix.compiler}} ;" > ~/user-config.jam
+
+      - name: Run tests
+        run: |
+          cd ../boost-root
+          export CXXSTD=${{matrix.cxxstd}}
+          ./b2 -j3 libs/$LIBRARY/test toolset=${{matrix.toolset}} ${CXXSTD:+cxxstd=$CXXSTD} variant=debug,release
--- a/include/boost/thread/pthread/thread_data.hpp
+++ b/include/boost/thread/pthread/thread_data.hpp
@@ -58,7 +58,7 @@ namespace boost
          std::size_t page_size = ::sysconf( _SC_PAGESIZE);
 #endif
 #ifdef PTHREAD_STACK_MIN
-          if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
+          if (size<static_cast<std::size_t>(PTHREAD_STACK_MIN)) size=PTHREAD_STACK_MIN;
 #endif
          size = ((size+page_size-1)/page_size)*page_size;
          int res = pthread_attr_setstacksize(&val_, size);
--- a/meta/libraries.json
+++ b/meta/libraries.json
@@ -14,6 +14,7 @@
    "std": [ "proposal" ],    
    "category": [
      "Concurrent", "System"
-    ]
+    ],
+    "cxxstd": "03"
  }
 ]
--- a/src/win32/thread.cpp
+++ b/src/win32/thread.cpp
@@ -641,9 +641,15 @@ namespace boost
                timer_handle=CreateWaitableTimer(NULL,false,NULL);
                if(timer_handle!=0)
                {
-                    ULONG tolerable=32; // Empirical testing shows Windows ignores this when <= 26
+                    ULONG const min_tolerable=32; // Empirical testing shows Windows ignores this when <= 26
+                    ULONG const max_tolerable=1000;
+                    ULONG tolerable=min_tolerable;
                    if(time_left_msec/20>tolerable)  // 5%
+                    {
                        tolerable=static_cast<ULONG>(time_left_msec/20);
+                        if(tolerable>max_tolerable)
+                            tolerable=max_tolerable;
+                    }
                    LARGE_INTEGER due_time={{0,0}};
                    if(time_left_msec>0)
                    {
@@ -733,9 +739,15 @@ namespace boost
                timer_handle=CreateWaitableTimer(NULL,false,NULL);
                if(timer_handle!=0)
                {
-                    ULONG tolerable=32; // Empirical testing shows Windows ignores this when <= 26
+                    ULONG const min_tolerable=32; // Empirical testing shows Windows ignores this when <= 26
+                    ULONG const max_tolerable=1000;
+                    ULONG tolerable=min_tolerable;
                    if(time_left_msec/20>tolerable)  // 5%
+                    {
                        tolerable=static_cast<ULONG>(time_left_msec/20);
+                        if(tolerable>max_tolerable)
+                            tolerable=max_tolerable;
+                    }
                    LARGE_INTEGER due_time={{0,0}};
                    if(time_left_msec>0)
                    {
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -34,8 +34,7 @@ project
        <toolset>gcc:<cxxflags>-Wno-long-long
        #<toolset>gcc:<cxxflags>-ansi
        #<toolset>gcc:<cxxflags>-fpermissive
-        <toolset>gcc-4:<cxxflags>-Wno-variadic-macros
-        <toolset>gcc-5:<cxxflags>-Wno-variadic-macros
+        <toolset>gcc:<cxxflags>-Wno-variadic-macros
        #<toolset>gcc:<cxxflags>-Wunused-local-typedefs
        <toolset>gcc:<cxxflags>-Wunused-function
        <toolset>gcc:<cxxflags>-Wno-unused-parameter
@@ -62,6 +61,7 @@ project
        #<toolset>clang:<cxxflags>-fpermissive # doesn't work
        <toolset>clang:<cxxflags>-Wunused-function
        <toolset>clang:<cxxflags>-Wno-unused-parameter
+        <toolset>clang:<cxxflags>-Wno-c99-extensions

        #<toolset>gcc-mingw-4.4.0:<cxxflags>-fdiagnostics-show-option
        #<toolset>gcc-mingw-4.5.0:<cxxflags>-fdiagnostics-show-option
Author	SHA1	Message	Date
Peter Dimov	7f36ea346f	Merge pull request #336 from eldiener/develop [skip ci] Add "cxxstd" json field	2021-10-26 16:59:32 +03:00
Peter Dimov	660f293809	Remove all Windows jobs from ci.yml; the timeouts aren't sufficient and adjusting them all is too much work	2021-10-26 07:18:50 +03:00
Peter Dimov	d4b81d83f7	Remove mingw job; it's hopeless	2021-10-26 05:48:12 +03:00
Peter Dimov	e4d16eb4d9	Trim Windows jobs as they take too long	2021-10-26 05:47:43 +03:00
Peter Dimov	28a0a19cf0	Switch g++-5 to C++11	2021-10-26 05:07:37 +03:00
Peter Dimov	fca97a8826	Adjust warning suppression	2021-10-26 05:06:05 +03:00
Peter Dimov	48e639b124	Add .github/workflows	2021-10-26 03:53:10 +03:00
Peter Dimov	51f3e163b3	Merge branch 'develop' of https://github.com/Romain-Geissler-1A/thread into feature/pr-354	2021-10-26 02:00:43 +03:00
Peter Dimov	6fca28bfed	Merge pull request #356 from Dani-Hub/Tolerable-delay-in-interruptible_wait-on-Win32-is-too-long-2 #348 Tolerable delay in interruptible_wait on Win32 is too long	2021-08-27 20:16:59 +03:00
Daniel Krügler	636e4a869c	#348 Tolerable delay in interruptible_wait on Win32 is too long Ensure that SetWaitableTimerEx's TolerableDelay parameter is clamped between 32 and 1000 ms when computing the 5% deviation.	2021-08-17 18:50:24 +02:00
Romain Geissler	f9d0e594d4	Fix -Wsign-compare warning with glibc 2.34 on Linux platforms. In file included from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread_only.hpp:17, from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread.hpp:12, from src/GetTest.cpp:12: /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp: In member function 'void boost::thread_attributes::set_stack_size(std::size_t)': /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp:61:19: error: comparison of integer expressions of different signedness: 'std::size_t' {aka 'long unsigned int'} and 'long int' [-Werror=sign-compare] 61 \| if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN; \| ^	2021-08-10 14:22:28 +00:00
Edward Diener	c55e0952ee	[skip ci] Add "cxxstd" json field. The "cxxstd" json field is being added to each Boost library's meta json information for libraries in order to specify the minumum C++ standard compilation level. The value of this field matches one of the values for 'cxxstd' in Boost.Build. The purpose of doing this is to provide information for the Boost website documentation for each library which will specify the minimum C++ standard compilation that an end-user must employ in order to use the particular library. This will aid end-users who want to know if they can successfully use a Boost library based on their C++ compiler's compilation level, without having to search the library's documentation to find this out.	2021-01-21 16:22:48 -05:00