router work (continued)

Author: vinniefalco

include/boost/beast2/server/detail/any_router.hpp

@@ -16,7 +16,6 @@
 #include <boost/http_proto/method.hpp>
 #include <boost/url/segments_encoded_view.hpp>
 #include <boost/core/detail/string_view.hpp>
-#include <memory>
 #include <type_traits>
 
 namespace boost {
@@ -98,8 +97,14 @@ class any_router
     template<class Request, class Response, class Handler>
     struct errfn_impl;
 
-    any_router(
-        any_router const&) = default;
+    any_router() = default;
+
+    BOOST_BEAST2_DECL ~any_router();
+    BOOST_BEAST2_DECL any_router(any_router&&) noexcept;
+    BOOST_BEAST2_DECL any_router(any_router const&) noexcept;
+    BOOST_BEAST2_DECL any_router& operator=(any_router&&) noexcept;
+    BOOST_BEAST2_DECL any_router& operator=(any_router const&) noexcept;
+
     BOOST_BEAST2_DECL any_router(
         http_proto::method(*)(void*),
         urls::segments_encoded_view&(*)(void*));
@@ -114,7 +119,7 @@ class any_router
     BOOST_BEAST2_DECL void append_err(errfn_ptr);
     void append(bool, http_proto::method, core::string_view) {}
 
-    std::shared_ptr<impl> impl_;
+    impl* impl_ = nullptr;
 };
 
 //------------------------------------------------

src/server/detail/any_router.cpp

@@ -12,7 +12,7 @@
 #include <boost/beast2/server/detail/any_router.hpp>
 #include <boost/beast2/error.hpp>
 #include <boost/beast2/detail/except.hpp>
-#include <map>
+#include <atomic>
 #include <string>
 #include <vector>
 
@@ -56,6 +56,7 @@ struct any_router::entry
 
 struct any_router::impl
 {
+    std::atomic<std::size_t> refs{1};
     std::size_t size = 0;
     std::vector<entry> list;
     std::vector<errfn_ptr> errfns;
@@ -65,11 +66,58 @@ struct any_router::impl
 
 //------------------------------------------------
 
+any_router::
+~any_router()
+{
+    if(! impl_)
+        return;
+    if(--impl_->refs == 0)
+        delete impl_;
+}
+
+any_router::
+any_router(any_router&& other) noexcept
+    :impl_(other.impl_)
+{
+    other.impl_ = nullptr;
+}
+
+any_router::
+any_router(any_router const& other) noexcept
+{
+    impl_ = other.impl_;
+    ++impl_->refs;
+}
+
+any_router&
+any_router::
+operator=(any_router&& other) noexcept
+{
+    auto p = impl_;
+    impl_ = other.impl_;
+    other.impl_ = nullptr;
+    if(p && --p->refs == 0)
+        delete p;
+    return *this;
+}
+
+any_router&
+any_router::
+operator=(any_router const& other) noexcept
+{
+    auto p = impl_;
+    impl_ = other.impl_;
+    ++impl_->refs;
+    if(p && --p->refs == 0)
+        delete p;
+    return *this;
+}
+
 any_router::
 any_router(
     http_proto::method(*get_method)(void*),
     urls::segments_encoded_view&(*get_path)(void*))
-    : impl_(std::make_shared<impl>())
+    : impl_(new impl)
 {
     impl_->get_path = get_path;
     impl_->get_method = get_method;