Disentangle the pending_processor code

Author: joto

src/dependency-manager.cpp

@@ -43,18 +43,18 @@ bool full_dependency_manager_t::has_pending() const noexcept
     return !m_ways_pending_tracker.empty() || !m_rels_pending_tracker.empty();
 }
 
-void full_dependency_manager_t::process_pending(middle_t::pending_processor &pf)
+void full_dependency_manager_t::process_pending(pending_processor &proc)
 {
     osmid_t id;
     while (id_tracker::is_valid(id = m_ways_pending_tracker.pop_mark())) {
-        pf.enqueue_ways(id);
+        proc.enqueue_way(id);
     }
 
-    pf.process_ways();
+    proc.process_ways();
 
     while (id_tracker::is_valid(id = m_rels_pending_tracker.pop_mark())) {
-        pf.enqueue_relations(id);
+        proc.enqueue_relation(id);
     }
 
-    pf.process_relations();
+    proc.process_relations();
 }

src/dependency-manager.hpp

@@ -7,6 +7,17 @@
 
 #include <cassert>
 
+struct pending_processor
+{
+    virtual ~pending_processor() = default;
+
+    virtual void enqueue_way(osmid_t id) = 0;
+    virtual void enqueue_relation(osmid_t id) = 0;
+
+    virtual void process_ways() = 0;
+    virtual void process_relations() = 0;
+};
+
 /**
  * The job of the dependency manager is to keep track of the dependencies
  * between OSM objects, that is nodes in ways and members of relations.
@@ -64,7 +75,7 @@ class dependency_manager_t
      *
      * \post !has_pending()
      */
-    virtual void process_pending(middle_t::pending_processor &) {}
+    virtual void process_pending(pending_processor &) {}
 };
 
 /**
@@ -100,7 +111,7 @@ class full_dependency_manager_t : public dependency_manager_t
 
     bool has_pending() const noexcept override;
 
-    void process_pending(middle_t::pending_processor &pf) override;
+    void process_pending(pending_processor &proc) override;
 
     /**
      * Get access to the pending way ids. This is for debugging only.

src/middle.hpp

@@ -127,15 +127,6 @@ struct middle_t
     virtual idlist_t get_rels_by_rel(osmid_t) { return {}; }
     virtual idlist_t get_ways_by_rel(osmid_t) { return {}; }
 
-    struct pending_processor
-    {
-        virtual ~pending_processor() {}
-        virtual void enqueue_ways(osmid_t id) = 0;
-        virtual void process_ways() = 0;
-        virtual void enqueue_relations(osmid_t id) = 0;
-        virtual void process_relations() = 0;
-    };
-
     virtual std::shared_ptr<middle_query_t> get_query_instance() = 0;
 };
 

src/osmdata.cpp

@@ -4,6 +4,7 @@
 #include <future>
 #include <memory>
 #include <mutex>
+#include <stack>
 #include <stdexcept>
 #include <utility>
 #include <vector>
@@ -162,11 +163,18 @@ void osmdata_t::flush() const
 
 namespace {
 
-//TODO: have the main thread using the main middle to query the middle for batches of ways (configurable number)
-//and stuffing those into the work queue, so we have a single producer multi consumer threaded queue
-//since the fetching from middle should be faster than the processing in each backend.
+struct pending_job_t
+{
+    osmid_t osm_id;
+    size_t output_id;
+
+    pending_job_t() : osm_id(0), output_id(0) {}
+    pending_job_t(osmid_t id, size_t oid) : osm_id(id), output_id(oid) {}
+};
+
+using pending_queue_t = std::stack<pending_job_t>;
 
-struct pending_threaded_processor : public middle_t::pending_processor
+struct pending_threaded_processor : public pending_processor
 {
     using output_vec_t = std::vector<std::shared_ptr<output_t>>;
 
@@ -241,7 +249,7 @@ struct pending_threaded_processor : public middle_t::pending_processor
         }
     }
 
-    void enqueue_ways(osmid_t id) override
+    void enqueue_way(osmid_t id) override
     {
         for (size_t i = 0; i < outs.size(); ++i) {
             if (outs[i]->need_forward_dependencies()) {
@@ -304,7 +312,7 @@ struct pending_threaded_processor : public middle_t::pending_processor
         }
     }
 
-    void enqueue_relations(osmid_t id) override
+    void enqueue_relation(osmid_t id) override
     {
         for (size_t i = 0; i < outs.size(); ++i) {
             if (outs[i]->need_forward_dependencies()) {

src/output.hpp

@@ -10,28 +10,13 @@
  * Associated tags: name, type etc.
 */
 
-#include <stack>
-
 #include <osmium/thread/pool.hpp>
 
 #include "options.hpp"
 
-struct expire_tiles;
-struct id_tracker;
 struct middle_query_t;
 class db_copy_thread_t;
 
-struct pending_job_t
-{
-    osmid_t osm_id;
-    size_t output_id;
-
-    pending_job_t() : osm_id(0), output_id(0) {}
-    pending_job_t(osmid_t id, size_t oid) : osm_id(id), output_id(oid) {}
-};
-
-using pending_queue_t = std::stack<pending_job_t>;
-
 class output_t
 {
 public: