[indexing] prevent nested rebuilds

Author: tstack

release/loggen.py

@@ -211,7 +211,7 @@ def syslog_msgs():
 ]
 
 COUNTER = 0
-while COUNTER < 5000:
+while COUNTER < 500000:
     loop_inc = datetime.timedelta(seconds=random.weibullvariate(1, 1.5) * 500)
     ACCESS_LOG_CURR_TIME += loop_inc
     SYSLOG_LOG_CURR_TIME += loop_inc
@@ -230,6 +230,6 @@ def syslog_msgs():
                     fp.write(next(gen))
                 # if random.uniform(0.0, 1.0) < 0.010:
                 #    fp.truncate(0)
-            time.sleep(random.uniform(0.01, 0.02))
+            time.sleep(random.uniform(0.0001, 0.0002))
             # if random.uniform(0.0, 1.0) < 0.001:
             #    os.remove(fname)

src/base/guard_util.hh

@@ -48,6 +48,27 @@ struct guard_helper {
     bool gh_enabled{true};
 };
 
+struct recursion_preventer : guard_helper {
+    explicit recursion_preventer(size_t* depth) : rp_depth(depth)
+    {
+        *rp_depth += 1;
+    }
+
+    recursion_preventer(const recursion_preventer&) = delete;
+    recursion_preventer& operator=(const recursion_preventer&) = delete;
+    recursion_preventer& operator=(recursion_preventer&&) = default;
+    recursion_preventer(recursion_preventer&&) = default;
+
+    ~recursion_preventer()
+    {
+        if (this->gh_enabled) {
+            *rp_depth -= 1;
+        }
+    }
+
+    size_t* rp_depth{nullptr};
+};
+
 }  // namespace lnav
 
 #endif

src/lnav.cc

@@ -988,6 +988,7 @@ struct refresh_status_bars {
     {
         static auto* breadcrumb_view = injector::get<breadcrumb_curses*>();
         static auto& prompt = lnav::prompt::get();
+        static auto& exec_phase = injector::get<lnav::exec_phase&>();
         static const auto cancel_msg
             = lnav::console::user_message::info(
                   attr_line_t("performing operation, press ")
@@ -1003,33 +1004,33 @@ struct refresh_status_bars {
         }
 
         gettimeofday(&current_time, nullptr);
-        while (notcurses_get_nblock(this->rsb_screen->get_notcurses(), &ch) > 0)
-        {
-            lnav_data.ld_user_message_source.clear();
-
-            alerter::singleton().new_input(ch);
-
-            lnav_data.ld_input_dispatcher.new_input(
-                current_time, this->rsb_screen->get_notcurses(), ch);
-
-            lnav_data.ld_view_stack.top() | [ch](auto tc) {
-                lnav_data.ld_key_repeat_history.update(ch.id, tc->get_top());
-            };
-
-            if (ncinput_ctrl_p(&ch) && ch.id == ']') {
-                lnav_data.ld_bottom_source.update_loading(0, 0);
-                lnav_data.ld_status[LNS_BOTTOM].set_needs_update();
-                retval = lnav::progress_result_t::interrupt;
-            }
+        auto time_diff = current_time - this->rsb_last_loop_read_time;
+        if (to_us(time_diff) > (exec_phase.interactive() ? 100ms : 2s)) {
+            while (notcurses_get_nblock(this->rsb_screen->get_notcurses(), &ch)
+                   > 0)
+            {
+                lnav_data.ld_user_message_source.clear();
+                if ((!exec_phase.interactive() && ch.id == 'q')
+                    || (ncinput_ctrl_p(&ch) && ch.id == ']'))
+                {
+                    lnav_data.ld_bottom_source.update_loading(0, 0);
+                    lnav_data.ld_status[LNS_BOTTOM].set_needs_update();
+                    retval = lnav::progress_result_t::interrupt;
+                } else {
+                    log_warning(
+                        "ignoring input while refreshing status bars: %x",
+                        ch.id);
+                }
 
-            ncinput_free_paste_content(&ch);
+                ncinput_free_paste_content(&ch);
 
-            if (!lnav_data.ld_looping) {
-                // No reason to keep processing input after the
-                // user has quit.  The view stack will also be
-                // empty, which will cause issues.
-                retval = lnav::progress_result_t::interrupt;
-                break;
+                if (!lnav_data.ld_looping) {
+                    // No reason to keep processing input after the
+                    // user has quit.  The view stack will also be
+                    // empty, which will cause issues.
+                    retval = lnav::progress_result_t::interrupt;
+                    break;
+                }
             }
         }
 
@@ -1084,6 +1085,7 @@ struct refresh_status_bars {
 
     screen_curses* rsb_screen;
     std::shared_ptr<top_status_source> rsb_top_source;
+    timeval rsb_last_loop_read_time{0};
 };
 
 static void
@@ -2274,6 +2276,7 @@ VALUES ('org.lnav.mouse-support', -1, DATETIME('now', '+1 minute'),
         gettimeofday(&current_time, nullptr);
         ui_now = ui_clock::now();
         lb.tick(current_time);
+        refresher->rsb_last_loop_read_time = current_time;
 
         got_user_input = false;
         if (rc < 0) {

src/lnav.indexing.cc

@@ -215,8 +215,15 @@ rebuild_indexes_result_t
 rebuild_indexes(std::optional<ui_clock::time_point> deadline)
 {
     static auto op = lnav_operation{"rebuild_indexes"};
-
     static auto& exec_phase = injector::get<lnav::exec_phase&>();
+    thread_local size_t rdepth;
+
+    if (rdepth > 0) {
+        log_warning("skipping nested rebuild");
+        return {0, false, true};
+    }
+
+    auto recurse_guard = lnav::recursion_preventer{&rdepth};
     auto op_guard = lnav_opid_guard::internal(op);
 
     auto& lss = lnav_data.ld_log_source;
@@ -484,6 +491,14 @@ rebuild_indexes(std::optional<ui_clock::time_point> deadline)
 void
 rebuild_indexes_repeatedly()
 {
+    thread_local size_t rdepth;
+
+    if (rdepth > 0) {
+        log_warning("skipping nested rebuild");
+        return;
+    }
+
+    auto recurse_guard = lnav::recursion_preventer{&rdepth};
     for (size_t attempt = 0; attempt < 50; attempt++) {
         auto rebuild_res = rebuild_indexes();
         if (!rebuild_res.rir_completed) {

src/lnav_config.cc

@@ -2393,6 +2393,7 @@ reload_config(std::vector<lnav::console::user_message>& errors)
                     return;
                 }
 
+                log_error("  property path: %s", path.c_str());
                 auto loc_iter
                     = lnav_config_locations.find(intern_string::lookup(path));
                 auto has_loc = loc_iter != lnav_config_locations.end();

src/logfile.cc

@@ -1781,6 +1781,7 @@ logfile::rebuild_index(std::optional<ui_clock::time_point> deadline)
                     this->get_content_size());
 
                 if (indexing_res == lnav::progress_result_t::interrupt) {
+                    log_debug("indexing interrupted");
                     break;
                 }
             }
@@ -2297,16 +2298,16 @@ logfile::message_byte_length(logfile::const_iterator ll, bool include_continues)
         if (retval > 0 && !this->lf_partial_line) {
             retval -= 1;
         }
+        require_ge(retval, 0);
     } else {
         retval = next_line->get_offset() - ll->get_offset() - 1;
         if (!include_continues) {
             this->lf_next_line_cache
                 = std::make_optional(std::make_pair(ll->get_offset(), retval));
         }
+        require_ge(retval, 0);
     }
 
-    require_ge(retval, 0);
-
     return {retval, line_count, meta};
 }
 

src/view_curses.cc

@@ -461,8 +461,8 @@ view_curses::mvwattrline(ncplane* window,
     for (auto iter = sa.cbegin(); iter != sa.cend(); ++iter) {
         auto attr_range = iter->sa_range;
 
-        require(attr_range.lr_start >= 0);
-        require(attr_range.lr_end >= -1);
+        require_ge(attr_range.lr_start, 0);
+        require_ge(attr_range.lr_end, -1);
 
         if (!(iter->sa_type == &VC_ROLE || iter->sa_type == &VC_ROLE_FG
               || iter->sa_type == &VC_STYLE || iter->sa_type == &VC_GRAPHIC