Merge pull request #1361 from joto/refactor-progress-code

Refactor progress code

Author: lonvia

src/osm2pgsql.cpp

@@ -117,11 +117,9 @@ int main(int argc, char *argv[])
 
         // Processing: In this phase the input file(s) are read and parsed,
         // populating some of the tables.
-        progress_display_t progress;
-
         util::timer_t timer_parse;
 
-        progress.update(osmdata.process_files(files, options.bbox));
+        auto const progress = osmdata.process_files(files, options.bbox);
 
         progress.print_status(std::time(nullptr));
         fmt::print(stderr, "  parse time: {}\n",

src/progress-display.cpp

@@ -2,13 +2,6 @@
 #include "logging.hpp"
 #include "progress-display.hpp"
 
-void progress_display_t::update(progress_display_t const &other) noexcept
-{
-    m_node += other.m_node;
-    m_way += other.m_way;
-    m_rel += other.m_rel;
-}
-
 void progress_display_t::print_summary() const
 {
     std::time_t const now = std::time(nullptr);

src/progress-display.hpp

@@ -21,72 +21,52 @@ class progress_display_t
 {
     struct Counter
     {
-        osmid_t count = 0;
+        std::size_t count = 0;
         osmid_t max = 0;
         std::time_t start = 0;
-        int m_frac;
-
-        explicit Counter(int frac) noexcept : m_frac(frac) {}
 
         osmid_t count_k() const noexcept { return count / 1000; }
 
-        bool add(osmid_t id) noexcept
+        std::size_t add(osmid_t id) noexcept
         {
-            if (id > max) {
-                max = id;
-            }
+            max = id;
             if (count == 0) {
                 start = std::time(nullptr);
             }
-            ++count;
-
-            return count % m_frac == 0;
-        }
-
-        Counter &operator+=(Counter const &rhs) noexcept
-        {
-            count += rhs.count;
-            if (rhs.max > max) {
-                max = rhs.max;
-            }
-            if (start == 0) {
-                start = rhs.start;
-            }
-
-            return *this;
+            return ++count;
         }
     };
 
 public:
     progress_display_t() noexcept : m_last_print_time(std::time(nullptr)) {}
 
-    void update(progress_display_t const &other) noexcept;
     void print_summary() const;
     void print_status(std::time_t now) const;
-    void possibly_print_status();
 
     void add_node(osmid_t id)
     {
-        if (m_node.add(id)) {
+        if (m_node.add(id) % 10000 == 0) {
             possibly_print_status();
         }
     }
 
     void add_way(osmid_t id)
     {
-        if (m_way.add(id)) {
+        if (m_way.add(id) % 1000 == 0) {
             possibly_print_status();
         }
     }
 
     void add_rel(osmid_t id)
     {
-        if (m_rel.add(id)) {
+        if (m_rel.add(id) % 10 == 0) {
             possibly_print_status();
         }
     }
 
 private:
+    void possibly_print_status();
+
     static double count_per_second(osmid_t count, uint64_t elapsed) noexcept
     {
         if (count == 0) {
@@ -124,9 +104,9 @@ class progress_display_t
         return now - m_rel.start;
     }
 
-    Counter m_node{10000};
-    Counter m_way{1000};
-    Counter m_rel{10};
+    Counter m_node{};
+    Counter m_way{};
+    Counter m_rel{};
     std::time_t m_last_print_time;
 };