flat routers are shared

Author: vinniefalco

include/boost/http/server/flat_router.hpp

@@ -18,6 +18,7 @@
 #include <boost/capy/task.hpp>
 #include <boost/assert.hpp>
 #include <exception>
+#include <memory>
 #include <string_view>
 #include <type_traits>
 
@@ -39,11 +40,9 @@ class BOOST_HTTP_DECL
     flat_router
 {
     struct impl;
-    impl* impl_;
+    std::shared_ptr<impl> impl_;
 
 public:
-    ~flat_router();
-
     flat_router(
         detail::router_base&&);
 

src/server/flat_router.cpp

@@ -338,16 +338,10 @@ struct flat_router::impl
 
 //------------------------------------------------
 
-flat_router::
-~flat_router()
-{
-    delete impl_;
-}
-
 flat_router::
 flat_router(
     detail::router_base&& src)
-    : impl_(new impl)
+    : impl_(std::make_shared<impl>())
 {
     impl_->flatten(*src.impl_);
 }

test/unit/server/flat_router.cpp

@@ -10,17 +10,79 @@
 // Test that header file is self-contained.
 #include <boost/http/server/flat_router.hpp>
 
+// Full functional tests are in beast2/test/unit/server/router.cpp
+
+#include <boost/http/server/router.hpp>
+#include <boost/capy/ex/run_sync.hpp>
+
 #include "test_suite.hpp"
 
 namespace boost {
 namespace http {
 
 struct flat_router_test
 {
+    using params = route_params_base;
+    using test_router = router<params>;
+
+    void testCopyConstruction()
+    {
+        auto counter = std::make_shared<int>(0);
+        test_router r;
+        r.all("/", [counter](params&) -> capy::task<route_result>
+        {
+            ++(*counter);
+            co_return route_result{};
+        });
+
+        flat_router fr1(std::move(r));
+        flat_router fr2(fr1);
+
+        params req;
+        capy::run_sync()(fr1.dispatch(
+            http::method::get, urls::url_view("/"), req));
+        BOOST_TEST_EQ(*counter, 1);
+
+        capy::run_sync()(fr2.dispatch(
+            http::method::get, urls::url_view("/"), req));
+        BOOST_TEST_EQ(*counter, 2);
+    }
+
+    void testCopyAssignment()
+    {
+        auto counter = std::make_shared<int>(0);
+        test_router r;
+        r.all("/", [counter](params&) -> capy::task<route_result>
+        {
+            ++(*counter);
+            co_return route_result{};
+        });
+
+        flat_router fr1(std::move(r));
+
+        test_router r2;
+        r2.all("/", [](params&) -> capy::task<route_result>
+        {
+            co_return route_result{};
+        });
+        flat_router fr2(std::move(r2));
+
+        fr2 = fr1;
+
+        params req;
+        capy::run_sync()(fr1.dispatch(
+            http::method::get, urls::url_view("/"), req));
+        BOOST_TEST_EQ(*counter, 1);
+
+        capy::run_sync()(fr2.dispatch(
+            http::method::get, urls::url_view("/"), req));
+        BOOST_TEST_EQ(*counter, 2);
+    }
+
     void run()
     {
-        // Header compilation test only.
-        // Functional tests are in router.cpp.
+        testCopyConstruction();
+        testCopyAssignment();
     }
 };