Store std::shared_ptr<middle_t> in dependency manager

Author: joto

src/dependency-manager.hpp

@@ -6,6 +6,7 @@
 #include "osmtypes.hpp"
 
 #include <cassert>
+#include <memory>
 
 struct pending_processor
 {
@@ -97,10 +98,10 @@ class full_dependency_manager_t : public dependency_manager_t
      *
      * \pre object_store != nullptr
      */
-    explicit full_dependency_manager_t(middle_t *object_store)
-    : m_object_store(object_store)
+    explicit full_dependency_manager_t(std::shared_ptr<middle_t> object_store)
+    : m_object_store(std::move(object_store))
     {
-        assert(object_store != nullptr);
+        assert(m_object_store != nullptr);
     }
 
     void node_changed(osmid_t id) override;
@@ -153,7 +154,7 @@ class full_dependency_manager_t : public dependency_manager_t
     }
 
 private:
-    middle_t *m_object_store;
+    std::shared_ptr<middle_t> m_object_store;
 
     id_tracker m_ways_pending_tracker;
     id_tracker m_rels_pending_tracker;

src/osm2pgsql.cpp

@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
                         });
 
         auto dependency_manager = std::unique_ptr<dependency_manager_t>(
-            need_dependencies ? new full_dependency_manager_t{middle.get()}
+            need_dependencies ? new full_dependency_manager_t{middle}
                               : new dependency_manager_t{});
 
         osmdata_t osmdata{dependency_manager.get(), middle, outputs};

tests/common-import.hpp

@@ -88,7 +88,7 @@ class import_t
                         });
 
         auto dependency_manager = std::unique_ptr<dependency_manager_t>(
-            need_dependencies ? new full_dependency_manager_t{middle.get()}
+            need_dependencies ? new full_dependency_manager_t{middle}
                               : new dependency_manager_t{});
 
         osmdata_t osmdata{dependency_manager.get(), middle, outputs};
@@ -112,7 +112,7 @@ class import_t
         auto const outputs =
             output_t::create_outputs(middle->get_query_instance(), options);
 
-        full_dependency_manager_t dependency_manager{middle.get()};
+        full_dependency_manager_t dependency_manager{middle};
 
         parse_file(options, &dependency_manager, middle, outputs, file);
     }
@@ -143,7 +143,7 @@ class import_t
             std::make_shared<db_copy_thread_t>(
                 options.database_options.conninfo()));
 
-        full_dependency_manager_t dependency_manager{mid_pgsql.get()};
+        full_dependency_manager_t dependency_manager{mid_pgsql};
 
         parse_file(options, &dependency_manager, mid_pgsql, {out_test},
                    file);

tests/test-middle.cpp

@@ -1032,7 +1032,7 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
     // closed properly.
     {
         auto mid = std::make_shared<middle_pgsql_t>(&options);
-        full_dependency_manager_t dependency_manager{mid.get()};
+        full_dependency_manager_t dependency_manager{mid};
         mid->start();
 
         mid->node_set(node10);
@@ -1062,7 +1062,7 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
     SECTION("Single way affected")
     {
         auto mid = std::make_shared<middle_pgsql_t>(&options);
-        full_dependency_manager_t dependency_manager{mid.get()};
+        full_dependency_manager_t dependency_manager{mid};
         mid->start();
 
         mid->node_delete(10);
@@ -1095,7 +1095,7 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
         }
         {
             auto mid = std::make_shared<middle_pgsql_t>(&options);
-            full_dependency_manager_t dependency_manager{mid.get()};
+            full_dependency_manager_t dependency_manager{mid};
             mid->start();
 
             mid->node_delete(10);
@@ -1135,7 +1135,7 @@ TEMPLATE_TEST_CASE("middle: change nodes in way", "", options_slim_default,
 
         {
             auto mid = std::make_shared<middle_pgsql_t>(&options);
-            full_dependency_manager_t dependency_manager{mid.get()};
+            full_dependency_manager_t dependency_manager{mid};
             mid->start();
 
             mid->node_delete(10);
@@ -1198,7 +1198,7 @@ TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
     SECTION("Single relation directly affected")
     {
         auto mid = std::make_shared<middle_pgsql_t>(&options);
-        full_dependency_manager_t dependency_manager{mid.get()};
+        full_dependency_manager_t dependency_manager{mid};
         mid->start();
 
         mid->node_delete(10);
@@ -1219,7 +1219,7 @@ TEMPLATE_TEST_CASE("middle: change nodes in relation", "", options_slim_default,
     SECTION("Single relation indirectly affected (through way)")
     {
         auto mid = std::make_shared<middle_pgsql_t>(&options);
-        full_dependency_manager_t dependency_manager{mid.get()};
+        full_dependency_manager_t dependency_manager{mid};
         mid->start();
 
         mid->node_delete(11);