X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Flibs%2Flog%2Fsrc%2Fthreadsafe_queue.cpp;fp=ceph%2Fsrc%2Fboost%2Flibs%2Flog%2Fsrc%2Fthreadsafe_queue.cpp;h=3ca581ca0ac7d8fef10b633303ec747267990d7b;hb=1e59de90020f1d8d374046ef9cca56ccd4e806e2;hp=1a1656194aab10080bf436b936f2184c99c3e19c;hpb=bd41e436e25044e8e83156060a37c23cb661c364;p=ceph.git

diff --git a/ceph/src/boost/libs/log/src/threadsafe_queue.cpp b/ceph/src/boost/libs/log/src/threadsafe_queue.cpp
index 1a1656194..3ca581ca0 100644
--- a/ceph/src/boost/libs/log/src/threadsafe_queue.cpp
+++ b/ceph/src/boost/libs/log/src/threadsafe_queue.cpp
@@ -1,5 +1,5 @@
 /*
- *          Copyright Andrey Semashev 2007 - 2015.
+ *          Copyright Andrey Semashev 2007 - 2021.
  * Distributed under 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)
@@ -29,6 +29,8 @@
 #include <new>
 #include <boost/assert.hpp>
 #include <boost/throw_exception.hpp>
+#include <boost/memory_order.hpp>
+#include <boost/atomic/atomic.hpp>
 #include <boost/align/aligned_alloc.hpp>
 #include <boost/type_traits/alignment_of.hpp>
 #include <boost/log/detail/adaptive_mutex.hpp>
@@ -76,11 +78,20 @@ public:
         m_Head.node = m_Tail.node = first_node;
     }
 
-    ~threadsafe_queue_impl_generic() BOOST_OVERRIDE
+    static void* operator new (std::size_t size)
     {
+        void* p = alignment::aligned_alloc(BOOST_LOG_CPU_CACHE_LINE_SIZE, size);
+        if (BOOST_UNLIKELY(!p))
+            BOOST_THROW_EXCEPTION(std::bad_alloc());
+        return p;
     }
 
-    node_base* reset_last_node() BOOST_OVERRIDE
+    static void operator delete (void* p, std::size_t) BOOST_NOEXCEPT
+    {
+        alignment::aligned_free(p);
+    }
+
+    node_base* reset_last_node() BOOST_NOEXCEPT
     {
         BOOST_ASSERT(m_Head.node == m_Tail.node);
         node_base* p = m_Head.node;
@@ -88,22 +99,22 @@ public:
         return p;
     }
 
-    bool unsafe_empty() BOOST_OVERRIDE
+    bool unsafe_empty() const BOOST_NOEXCEPT
     {
         return m_Head.node == m_Tail.node;
     }
 
-    void push(node_base* p) BOOST_OVERRIDE
+    void push(node_base* p)
     {
         set_next(p, NULL);
-        exclusive_lock_guard< mutex_type > _(m_Tail.mutex);
+        exclusive_lock_guard< mutex_type > lock(m_Tail.mutex);
         set_next(m_Tail.node, p);
         m_Tail.node = p;
     }
 
-    bool try_pop(node_base*& node_to_free, node_base*& node_with_value) BOOST_OVERRIDE
+    bool try_pop(node_base*& node_to_free, node_base*& node_with_value)
     {
-        exclusive_lock_guard< mutex_type > _(m_Head.mutex);
+        exclusive_lock_guard< mutex_type > lock(m_Head.mutex);
         node_base* next = get_next(m_Head.node);
         if (next)
         {
@@ -119,11 +130,11 @@ public:
 private:
     BOOST_FORCEINLINE static void set_next(node_base* p, node_base* next)
     {
-        p->next.data[0] = next;
+        p->next.store(next, boost::memory_order_relaxed);
     }
     BOOST_FORCEINLINE static node_base* get_next(node_base* p)
     {
-        return static_cast< node_base* >(p->next.data[0]);
+        return p->next.load(boost::memory_order_relaxed);
     }
 
     // Copying and assignment are closed
@@ -131,22 +142,42 @@ private:
     BOOST_DELETED_FUNCTION(threadsafe_queue_impl_generic& operator= (threadsafe_queue_impl_generic const&))
 };
 
+inline threadsafe_queue_impl::threadsafe_queue_impl()
+{
+}
+
+inline threadsafe_queue_impl::~threadsafe_queue_impl()
+{
+}
+
 BOOST_LOG_API threadsafe_queue_impl* threadsafe_queue_impl::create(node_base* first_node)
 {
     return new threadsafe_queue_impl_generic(first_node);
 }
 
-BOOST_LOG_API void* threadsafe_queue_impl::operator new (std::size_t size)
+BOOST_LOG_API void threadsafe_queue_impl::destroy(threadsafe_queue_impl* impl) BOOST_NOEXCEPT
+{
+    delete static_cast< threadsafe_queue_impl_generic* >(impl);
+}
+
+BOOST_LOG_API threadsafe_queue_impl::node_base* threadsafe_queue_impl::reset_last_node(threadsafe_queue_impl* impl) BOOST_NOEXCEPT
+{
+    return static_cast< threadsafe_queue_impl_generic* >(impl)->reset_last_node();
+}
+
+BOOST_LOG_API bool threadsafe_queue_impl::unsafe_empty(const threadsafe_queue_impl* impl) BOOST_NOEXCEPT
+{
+    return static_cast< const threadsafe_queue_impl_generic* >(impl)->unsafe_empty();
+}
+
+BOOST_LOG_API void threadsafe_queue_impl::push(threadsafe_queue_impl* impl, node_base* p)
 {
-    void* p = alignment::aligned_alloc(BOOST_LOG_CPU_CACHE_LINE_SIZE, size);
-    if (BOOST_UNLIKELY(!p))
-        BOOST_THROW_EXCEPTION(std::bad_alloc());
-    return p;
+    static_cast< threadsafe_queue_impl_generic* >(impl)->push(p);
 }
 
-BOOST_LOG_API void threadsafe_queue_impl::operator delete (void* p, std::size_t)
+BOOST_LOG_API bool threadsafe_queue_impl::try_pop(threadsafe_queue_impl* impl, node_base*& node_to_free, node_base*& node_with_value)
 {
-    alignment::aligned_free(p);
+    return static_cast< threadsafe_queue_impl_generic* >(impl)->try_pop(node_to_free, node_with_value);
 }
 
 } // namespace aux