passenger 6.1.0 → 6.1.1

data/src/cxx_supportlib/vendor-modified/boost/atomic/detail/wait_ops_dragonfly_umtx.hpp

@@ -3,7 +3,7 @@
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
  *
- * Copyright (c) 2020 Andrey Semashev
+ * Copyright (c) 2020-2025 Andrey Semashev
  */
 /*!
  * \file   atomic/detail/wait_ops_dragonfly_umtx.hpp
@@ -16,8 +16,12 @@
 #define BOOST_ATOMIC_DETAIL_WAIT_OPS_DRAGONFLY_UMTX_HPP_INCLUDED_
 
 #include <unistd.h>
+#include <cstdint>
+#include <limits>
+#include <chrono>
 #include <boost/memory_order.hpp>
 #include <boost/atomic/detail/config.hpp>
+#include <boost/atomic/detail/chrono.hpp>
 #include <boost/atomic/detail/wait_operations_fwd.hpp>
 #include <boost/atomic/detail/header.hpp>
 
@@ -33,36 +37,101 @@ template< typename Base, bool Interprocess >
 struct wait_operations< Base, sizeof(int), true, Interprocess > :
     public Base
 {
-    typedef Base base_type;
-    typedef typename base_type::storage_type storage_type;
+    using base_type = Base;
+    using storage_type = typename base_type::storage_type;
 
-    static BOOST_CONSTEXPR_OR_CONST bool always_has_native_wait_notify = true;
+public:
+    static constexpr bool always_has_native_wait_notify = true;
 
-    static BOOST_FORCEINLINE bool has_native_wait_notify(storage_type const volatile&) BOOST_NOEXCEPT
+    static BOOST_FORCEINLINE bool has_native_wait_notify(storage_type const volatile&) noexcept
     {
         return true;
     }
 
-    static BOOST_FORCEINLINE storage_type wait(storage_type const volatile& storage, storage_type old_val, memory_order order) BOOST_NOEXCEPT
+    static BOOST_FORCEINLINE storage_type wait(storage_type const volatile& storage, storage_type old_val, memory_order order) noexcept
     {
         storage_type new_val = base_type::load(storage, order);
         while (new_val == old_val)
         {
-            ::umtx_sleep(reinterpret_cast< int* >(const_cast< storage_type* >(&storage)), static_cast< int >(old_val), 0);
+            umtx_sleep(reinterpret_cast< int* >(const_cast< storage_type* >(&storage)), static_cast< int >(old_val), 0);
             new_val = base_type::load(storage, order);
         }
 
         return new_val;
     }
 
-    static BOOST_FORCEINLINE void notify_one(storage_type volatile& storage) BOOST_NOEXCEPT
+private:
+    template< typename Clock >
+    static BOOST_FORCEINLINE storage_type wait_until_impl
+    (
+        storage_type const volatile& storage,
+        storage_type old_val,
+        typename Clock::time_point timeout,
+        typename Clock::time_point now,
+        memory_order order,
+        bool& timed_out
+    ) noexcept(noexcept(Clock::now()))
     {
-        ::umtx_wakeup(reinterpret_cast< int* >(const_cast< storage_type* >(&storage)), 1);
+        storage_type new_val = base_type::load(storage, order);
+        while (new_val == old_val)
+        {
+            const std::int64_t usec = atomics::detail::chrono::ceil< std::chrono::microseconds >(timeout - now).count();
+            if (usec <= 0)
+            {
+                timed_out = true;
+                break;
+            }
+
+            umtx_sleep
+            (
+                reinterpret_cast< int* >(const_cast< storage_type* >(&storage)),
+                static_cast< int >(old_val),
+                usec <= (std::numeric_limits< int >::max)() ? static_cast< int >(usec) : (std::numeric_limits< int >::max)()
+            );
+
+            now = Clock::now();
+            new_val = base_type::load(storage, order);
+        }
+
+        return new_val;
+    }
+
+public:
+    template< typename Clock, typename Duration >
+    static BOOST_FORCEINLINE storage_type wait_until
+    (
+        storage_type const volatile& storage,
+        storage_type old_val,
+        std::chrono::time_point< Clock, Duration > timeout,
+        memory_order order,
+        bool& timed_out
+    ) noexcept(noexcept(Clock::now()))
+    {
+        return wait_until_impl< Clock >(storage, old_val, timeout, Clock::now(), order, timed_out);
+    }
+
+    template< typename Rep, typename Period >
+    static BOOST_FORCEINLINE storage_type wait_for
+    (
+        storage_type const volatile& storage,
+        storage_type old_val,
+        std::chrono::duration< Rep, Period > timeout,
+        memory_order order,
+        bool& timed_out
+    ) noexcept
+    {
+        const std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
+        return wait_until_impl< std::chrono::steady_clock >(storage, old_val, now + timeout, now, order, timed_out);
+    }
+
+    static BOOST_FORCEINLINE void notify_one(storage_type volatile& storage) noexcept
+    {
+        umtx_wakeup(reinterpret_cast< int* >(const_cast< storage_type* >(&storage)), 1);
     }
 
-    static BOOST_FORCEINLINE void notify_all(storage_type volatile& storage) BOOST_NOEXCEPT
+    static BOOST_FORCEINLINE void notify_all(storage_type volatile& storage) noexcept
     {
-        ::umtx_wakeup(reinterpret_cast< int* >(const_cast< storage_type* >(&storage)), 0);
+        umtx_wakeup(reinterpret_cast< int* >(const_cast< storage_type* >(&storage)), 0);
     }
 };
 

data/src/cxx_supportlib/vendor-modified/boost/atomic/detail/wait_ops_emulated.hpp

@@ -3,7 +3,7 @@
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
  *
- * Copyright (c) 2020 Andrey Semashev
+ * Copyright (c) 2020-2025 Andrey Semashev
  */
 /*!
  * \file   atomic/detail/wait_ops_emulated.hpp
@@ -15,8 +15,16 @@
 #define BOOST_ATOMIC_DETAIL_WAIT_OPS_EMULATED_HPP_INCLUDED_
 
 #include <cstddef>
+#include <chrono>
 #include <boost/memory_order.hpp>
 #include <boost/atomic/detail/config.hpp>
+#if !defined(BOOST_WINDOWS)
+#include <time.h>
+#include <type_traits>
+#include <boost/atomic/posix_clock_traits_fwd.hpp>
+#include <boost/atomic/detail/has_posix_clock_traits.hpp>
+#endif
+#include <boost/atomic/detail/chrono.hpp>
 #include <boost/atomic/detail/lock_pool.hpp>
 #include <boost/atomic/detail/wait_operations_fwd.hpp>
 #include <boost/atomic/detail/header.hpp>
@@ -34,24 +42,19 @@ template< typename Base >
 struct wait_operations_emulated :
     public Base
 {
-    typedef Base base_type;
-    typedef typename base_type::storage_type storage_type;
-    typedef lock_pool::scoped_lock< base_type::storage_alignment, true > scoped_lock;
-    typedef lock_pool::scoped_wait_state< base_type::storage_alignment > scoped_wait_state;
+    using base_type = Base;
+    using storage_type = typename base_type::storage_type;
+    using scoped_lock = lock_pool::scoped_lock< base_type::storage_alignment, true >;
+    using scoped_wait_state = lock_pool::scoped_wait_state< base_type::storage_alignment >;
 
-    static BOOST_CONSTEXPR_OR_CONST bool always_has_native_wait_notify = false;
+    static constexpr bool always_has_native_wait_notify = false;
 
-    static BOOST_FORCEINLINE bool has_native_wait_notify(storage_type const volatile&) BOOST_NOEXCEPT
+    static BOOST_FORCEINLINE bool has_native_wait_notify(storage_type const volatile&) noexcept
     {
         return false;
     }
 
-    static
-#if defined(BOOST_MSVC) && BOOST_MSVC < 1500
-    // In some cases, when this function is inlined, MSVC-8 (VS2005) x64 generates broken code that returns a bogus value from this function.
-    BOOST_NOINLINE
-#endif
-    storage_type wait(storage_type const volatile& storage, storage_type old_val, memory_order) BOOST_NOEXCEPT
+    static storage_type wait(storage_type const volatile& storage, storage_type old_val, memory_order) noexcept
     {
         static_assert(!base_type::is_interprocess, "Boost.Atomic: operation invoked on a non-lock-free inter-process atomic object");
         storage_type const& s = const_cast< storage_type const& >(storage);
@@ -66,14 +69,156 @@ struct wait_operations_emulated :
         return new_val;
     }
 
-    static void notify_one(storage_type volatile& storage) BOOST_NOEXCEPT
+private:
+    template< typename Clock >
+    static BOOST_FORCEINLINE storage_type wait_until_fallback
+    (
+        storage_type const volatile& storage,
+        storage_type old_val,
+        typename Clock::time_point timeout,
+        typename Clock::time_point now,
+        bool& timed_out
+    ) noexcept(noexcept(Clock::now()))
+    {
+        storage_type const& s = const_cast< storage_type const& >(storage);
+        scoped_wait_state wait_state(&storage);
+        storage_type new_val = s;
+        while (new_val == old_val)
+        {
+            const std::chrono::nanoseconds nsec = atomics::detail::chrono::ceil< std::chrono::nanoseconds >(timeout - now);
+            if (nsec.count() <= 0)
+            {
+                timed_out = true;
+                break;
+            }
+
+            wait_state.wait_for(nsec);
+
+            now = Clock::now();
+            new_val = s;
+        }
+
+        return new_val;
+    }
+
+#if !defined(BOOST_WINDOWS)
+
+    template< typename Clock >
+    static BOOST_FORCEINLINE storage_type wait_until_abs_timeout
+    (
+        storage_type const volatile& storage,
+        storage_type old_val,
+        typename Clock::time_point timeout,
+        bool& timed_out
+    ) noexcept
+    {
+        storage_type const& s = const_cast< storage_type const& >(storage);
+        scoped_wait_state wait_state(&storage);
+        storage_type new_val = s;
+        const timespec abs_timeout(posix_clock_traits< Clock >::to_timespec(timeout));
+        if (BOOST_LIKELY(abs_timeout.tv_sec >= 0))
+        {
+            while (new_val == old_val)
+            {
+                const bool wait_timed_out = wait_state.wait_until(posix_clock_traits< Clock >::clock_id, abs_timeout);
+                new_val = s;
+
+                if (wait_timed_out)
+                    goto timeout_expired;
+            }
+        }
+        else
+        {
+        timeout_expired:
+            timed_out = new_val == old_val;
+        }
+
+        return new_val;
+    }
+
+    template< typename Clock >
+    static BOOST_FORCEINLINE storage_type wait_until_dispatch
+    (
+        storage_type const volatile& storage,
+        storage_type old_val,
+        typename Clock::time_point timeout,
+        bool& timed_out,
+        std::true_type
+    ) noexcept
+    {
+        return wait_until_abs_timeout< Clock >(storage, old_val, timeout,timed_out);
+    }
+
+    template< typename Clock >
+    static BOOST_FORCEINLINE storage_type wait_until_dispatch
+    (
+        storage_type const volatile& storage,
+        storage_type old_val,
+        typename Clock::time_point timeout,
+        bool& timed_out,
+        std::false_type
+    ) noexcept(noexcept(Clock::now()))
+    {
+        return wait_until_fallback< Clock >(storage, old_val, timeout, Clock::now(), timed_out);
+    }
+
+public:
+    template< typename Clock, typename Duration >
+    static BOOST_FORCEINLINE storage_type wait_until
+    (
+        storage_type const volatile& storage,
+        storage_type old_val,
+        std::chrono::time_point< Clock, Duration > timeout,
+        memory_order,
+        bool& timed_out
+    ) noexcept(noexcept(wait_until_dispatch< Clock >(storage, old_val, timeout, timed_out, std::integral_constant< bool, has_posix_clock_traits< Clock >::value >())))
+    {
+        static_assert(!base_type::is_interprocess, "Boost.Atomic: operation invoked on a non-lock-free inter-process atomic object");
+        return wait_until_dispatch< Clock >(storage, old_val, timeout, timed_out, std::integral_constant< bool, has_posix_clock_traits< Clock >::value >());
+    }
+
+#else // !defined(BOOST_WINDOWS)
+
+public:
+    template< typename Clock, typename Duration >
+    static BOOST_FORCEINLINE storage_type wait_until
+    (
+        storage_type const volatile& storage,
+        storage_type old_val,
+        std::chrono::time_point< Clock, Duration > timeout,
+        memory_order,
+        bool& timed_out
+    ) noexcept(noexcept(wait_until_fallback< Clock >(storage, old_val, timeout, Clock::now(), timed_out)))
+    {
+        static_assert(!base_type::is_interprocess, "Boost.Atomic: operation invoked on a non-lock-free inter-process atomic object");
+        return wait_until_fallback< Clock >(storage, old_val, timeout, Clock::now(), timed_out);
+    }
+
+#endif // !defined(BOOST_WINDOWS)
+
+    template< typename Rep, typename Period >
+    static BOOST_FORCEINLINE storage_type wait_for
+    (
+        storage_type const volatile& storage,
+        storage_type old_val,
+        std::chrono::duration< Rep, Period > timeout,
+        memory_order,
+        bool& timed_out
+    ) noexcept
+    {
+        static_assert(!base_type::is_interprocess, "Boost.Atomic: operation invoked on a non-lock-free inter-process atomic object");
+        const std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
+        return wait_until_fallback< std::chrono::steady_clock >(storage, old_val, now + timeout, now, timed_out);
+    }
+
+    static void notify_one(storage_type volatile& storage) noexcept
     {
         static_assert(!base_type::is_interprocess, "Boost.Atomic: operation invoked on a non-lock-free inter-process atomic object");
         scoped_lock lock(&storage);
         lock_pool::notify_one(lock.get_lock_state(), &storage);
     }
 
-    static void notify_all(storage_type volatile& storage) BOOST_NOEXCEPT
+    static void notify_all(storage_type volatile& storage) noexcept
     {
         static_assert(!base_type::is_interprocess, "Boost.Atomic: operation invoked on a non-lock-free inter-process atomic object");
         scoped_lock lock(&storage);