[ui] refresh status bars when waiting for init command

Author: tstack

src/base/func_util.hh

@@ -33,8 +33,6 @@
 #include <functional>
 #include <utility>
 
-#include "progress.hh"
-
 template<typename F, typename FrontArg>
 decltype(auto)
 bind_mem(F&& f, FrontArg&& frontArg)
@@ -69,63 +67,6 @@ struct noop_func {
 
 namespace lnav::func {
 
-enum class op_type {
-    blocking,
-    interactive,
-};
-
-class scoped_cb {
-public:
-    using callback_type = std::function<progress_result_t(op_type)>;
-
-    class guard {
-    public:
-        explicit guard(scoped_cb* owner) : g_owner(owner) {}
-
-        guard(const guard&) = delete;
-        guard& operator=(const guard&) = delete;
-
-        guard(guard&& gu) noexcept : g_owner(std::exchange(gu.g_owner, nullptr))
-        {
-        }
-
-        guard& operator=(guard&& gu) noexcept
-        {
-            this->g_owner = std::exchange(gu.g_owner, nullptr);
-            return *this;
-        }
-
-        ~guard()
-        {
-            if (this->g_owner != nullptr) {
-                this->g_owner->s_callback = {};
-            }
-        }
-
-    private:
-        scoped_cb* g_owner;
-    };
-
-    guard install(callback_type cb)
-    {
-        this->s_callback = std::move(cb);
-
-        return guard{this};
-    }
-
-    progress_result_t operator()(op_type ot) const
-    {
-        if (s_callback) {
-            return s_callback(ot);
-        }
-
-        return progress_result_t::ok;
-    }
-
-private:
-    callback_type s_callback;
-};
-
 template<typename Fn,
          typename... Args,
          std::enable_if_t<std::is_member_pointer<std::decay_t<Fn>>{}, int> = 0>

src/base/progress.cc

@@ -29,6 +29,8 @@
 
 #include "progress.hh"
 
+using namespace std::chrono_literals;
+
 namespace lnav {
 
 progress_tracker&
@@ -46,7 +48,7 @@ progress_tracker::get_tasks()
 }
 
 void
-progress_tracker::wait_for_completion()
+progress_tracker::wait_for_completion(func::scoped_cb* scoped_cb)
 {
     std::unique_lock<std::mutex> lock(this->pt_mutex);
 
@@ -65,9 +67,12 @@ progress_tracker::wait_for_completion()
     }
 
     auto init_version = this->pt_version;
-    this->pt_cv.wait(lock, [&] {
-        return this->pt_abort || init_version != this->pt_version;
-    });
+    while (!this->pt_abort && init_version == this->pt_version) {
+        this->pt_cv.wait_for(lock, 100ms);
+        if (scoped_cb != nullptr) {
+            (*scoped_cb)(func::op_type::blocking);
+        }
+    }
 }
 
 void

src/base/progress.hh

@@ -37,6 +37,7 @@
 #include <vector>
 
 #include "distributed_slice.hh"
+#include "func_util.hh"
 #include "lnav.console.hh"
 #include "safe/safe.h"
 
@@ -52,6 +53,67 @@ enum class progress_status_t : uint8_t {
     working,
 };
 
+namespace func {
+
+enum class op_type {
+    blocking,
+    interactive,
+};
+
+class scoped_cb {
+public:
+    using callback_type = std::function<progress_result_t(op_type)>;
+
+    class guard {
+    public:
+        explicit guard(scoped_cb* owner) : g_owner(owner) {}
+
+        guard(const guard&) = delete;
+        guard& operator=(const guard&) = delete;
+
+        guard(guard&& gu) noexcept : g_owner(std::exchange(gu.g_owner, nullptr))
+        {
+        }
+
+        guard& operator=(guard&& gu) noexcept
+        {
+            this->g_owner = std::exchange(gu.g_owner, nullptr);
+            return *this;
+        }
+
+        ~guard()
+        {
+            if (this->g_owner != nullptr) {
+                this->g_owner->s_callback = {};
+            }
+        }
+
+    private:
+        scoped_cb* g_owner;
+    };
+
+    guard install(callback_type cb)
+    {
+        this->s_callback = std::move(cb);
+
+        return guard{this};
+    }
+
+    progress_result_t operator()(op_type ot) const
+    {
+        if (s_callback) {
+            return s_callback(ot);
+        }
+
+        return progress_result_t::ok;
+    }
+
+private:
+    callback_type s_callback;
+};
+
+}  // namespace func
+
 struct task_progress {
     std::string tp_id;
     progress_status_t tp_status{progress_status_t::idle};
@@ -73,7 +135,7 @@ struct progress_tracker {
 
     static safe_task_container& get_tasks();
 
-    void wait_for_completion();
+    void wait_for_completion(func::scoped_cb* scoped_cb);
 
     void notify_completion();
 

src/command_executor.cc

@@ -1009,7 +1009,7 @@ execute_init_commands(
                     setup_initial_view_stack();
                 }
 
-                lnav::progress_tracker::instance().wait_for_completion();
+                lnav::progress_tracker::instance().wait_for_completion(&lnav_data.ld_status_refresher);
             }
         }
     }