[tests] add some more gantt tests

src/fs-extension-functions.cc

@@ -42,11 +42,11 @@
 #include "base/auto_fd.hh"
 #include "base/auto_mem.hh"
 #include "base/auto_pid.hh"
+#include "base/injector.hh"
 #include "base/lnav.console.hh"
 #include "base/opt_util.hh"
 #include "bound_tags.hh"
 #include "config.h"
-#include "lnav.hh"
 #include "sqlite-extension-func.hh"
 #include "sqlite3.h"
 #include "vtab_module.hh"
@@ -188,7 +188,9 @@ sql_shell_exec(const char* cmd,
 {
     static const intern_string_t SRC = intern_string::lookup("options");
 
-    if (lnav_data.ld_flags & LNF_SECURE_MODE) {
+    static auto& lnav_flags = injector::get<unsigned long&, lnav_flags_tag>();
+
+    if (lnav_flags & LNF_SECURE_MODE) {
         throw sqlite_func_error("not available in secure mode");
     }
 

src/gantt_source.cc

@@ -599,6 +599,11 @@ void
 gantt_source::text_filters_changed()
 {
     this->rebuild_indexes();
+
+    if (this->tss_view != nullptr) {
+        this->tss_view->reload_data();
+        this->tss_view->redo_search();
+    }
 }
 
 int

src/listview_curses.cc

@@ -62,6 +62,8 @@ listview_curses::update_top_from_selection()
         this->set_top(this->lv_selection);
     } else if (this->lv_selection == this->get_inner_height() - 1_vl) {
         this->set_top(this->get_top_for_last_row());
+    } else if (height <= this->lv_tail_space) {
+        this->set_top(this->lv_selection);
     } else if (this->lv_selection
                >= (this->lv_top + height - this->lv_tail_space - 1_vl))
     {

src/lnav.cc

@@ -3355,8 +3355,7 @@ SELECT tbl_name FROM sqlite_master WHERE sql LIKE 'CREATE VIRTUAL TABLE%'
                     }
 
                     vis_line_t vl;
-                    for (vl = tc->get_top(); vl < tc->get_inner_height();
-                         ++vl, ++y)
+                    for (vl = tc->get_top(); vl < tc->get_inner_height(); ++vl)
                     {
                         std::vector<attr_line_t> rows(1);
                         tc->listview_value_for_rows(*tc, vl, rows);
@@ -3372,7 +3371,6 @@ SELECT tbl_name FROM sqlite_master WHERE sql LIKE 'CREATE VIRTUAL TABLE%'
                                 *tc, vl, row_overlay_content);
                             for (const auto& ov_row : row_overlay_content) {
                                 write_line_to(stdout, ov_row);
-                                ++y;
                             }
                         }
                     }

src/lnav.indexing.cc

@@ -280,11 +280,6 @@ rebuild_indexes(nonstd::optional<ui_clock::time_point> deadline)
     }
     if (!closed_files.empty()) {
         lnav_data.ld_active_files.close_files(closed_files);
-
-        auto* gantt_source = lnav_data.ld_views[LNV_GANTT].get_sub_source();
-        if (gantt_source != nullptr) {
-            gantt_source->text_filters_changed();
-        }
     }
 
     auto result = lss.rebuild_index(deadline);
@@ -358,7 +353,14 @@ rebuild_indexes(nonstd::optional<ui_clock::time_point> deadline)
         }
     }
 
-    lnav_data.ld_view_stack.top() | [](auto tc) {
+    lnav_data.ld_view_stack.top() | [&closed_files](auto tc) {
+        if (!closed_files.empty() && tc == &lnav_data.ld_views[LNV_GANTT]) {
+            auto* gantt_source = lnav_data.ld_views[LNV_GANTT].get_sub_source();
+            if (gantt_source != nullptr) {
+                gantt_source->text_filters_changed();
+            }
+        }
+
         auto* tss = tc->get_sub_source();
         lnav_data.ld_filter_status_source.update_filtered(tss);
         lnav_data.ld_scroll_broadcaster(tc);

src/logfile_sub_source.cc

@@ -148,6 +148,12 @@ struct filtered_logline_cmp {
         logline* ll_lhs = this->llss_controller.find_line(cl_lhs);
         logline* ll_rhs = this->llss_controller.find_line(cl_rhs);
 
+        if (ll_lhs == nullptr) {
+            return true;
+        }
+        if (ll_rhs == nullptr) {
+            return false;
+        }
         return (*ll_lhs) < (*ll_rhs);
     }
 
@@ -156,6 +162,9 @@ struct filtered_logline_cmp {
         content_line_t cl_lhs = (content_line_t) llss_controller.lss_index[lhs];
         logline* ll_lhs = this->llss_controller.find_line(cl_lhs);
 
+        if (ll_lhs == nullptr) {
+            return true;
+        }
         return (*ll_lhs) < rhs;
     }
 

test/expected/expected.am

@@ -276,6 +276,12 @@ EXPECTED_FILES = \
     $(srcdir)/%reldir%/test_format_loader.sh_fca6c1fb9f3aaa69b3ffb2d1a8a86434b2f4a247.out \
     $(srcdir)/%reldir%/test_gantt.sh_3af11588ee36bab7e2caea0f7a24d3c9cafd2310.err \
     $(srcdir)/%reldir%/test_gantt.sh_3af11588ee36bab7e2caea0f7a24d3c9cafd2310.out \
+    $(srcdir)/%reldir%/test_gantt.sh_83db753dd2669f801810f311e2d7d74397e10f26.err \
+    $(srcdir)/%reldir%/test_gantt.sh_83db753dd2669f801810f311e2d7d74397e10f26.out \
+    $(srcdir)/%reldir%/test_gantt.sh_8fed8a7400042814ba13e50be5e3bd1741d82119.err \
+    $(srcdir)/%reldir%/test_gantt.sh_8fed8a7400042814ba13e50be5e3bd1741d82119.out \
+    $(srcdir)/%reldir%/test_gantt.sh_cde7947f361e5f3d4cd1bbc3f7458f426b6a8eb4.err \
+    $(srcdir)/%reldir%/test_gantt.sh_cde7947f361e5f3d4cd1bbc3f7458f426b6a8eb4.out \
     $(srcdir)/%reldir%/test_json_format.sh_168cac40c27f547044c89d39eb0ff2ef81da4b21.err \
     $(srcdir)/%reldir%/test_json_format.sh_168cac40c27f547044c89d39eb0ff2ef81da4b21.out \
     $(srcdir)/%reldir%/test_json_format.sh_1bb0fd243e916546aea22029245ac590dae17a86.err \

test/expected/test_gantt.sh_3af11588ee36bab7e2caea0f7a24d3c9cafd2310.out

@@ -1,6 +1,10 @@
  2011-11-03T00:19:26.452         2011-11-03T00:21:13.204
      2011-11-03T00:17:00.000 2011-11-03T00:22:00.000
    Duration   | ✘▲ | Operation
+           844      CwFs1P2UcUdlSxD2La 192.168.2.76
+                    CoX7zA3OJKGUOSCBY2 192.168.2.76
+                    CdrfXZ1NOFPEawF218 192.168.2.76
+                    CJwUi9bdB9c1lLW44  192.168.2.76
                     CJxSUgkInyKSHiju1  192.168.2.76
                     CT0JIh479jXIGt0Po1 192.168.2.76
                     C6Q4Vm14ZJIlZhsXqk 192.168.2.76

test/expected/test_gantt.sh_8fed8a7400042814ba13e50be5e3bd1741d82119.out

@@ -0,0 +1,85 @@
+ 2011-11-03T00:19:26.452         2011-11-03T00:21:13.204
+     2011-11-03T00:17:00.000 2011-11-03T00:22:00.000
+   Duration   | ✘▲ | Operation
+           844      CwFs1P2UcUdlSxD2La 192.168.2.76
+                    CoX7zA3OJKGUOSCBY2 192.168.2.76
+                    CdrfXZ1NOFPEawF218 192.168.2.76
+                    CJwUi9bdB9c1lLW44  192.168.2.76
+                    CJxSUgkInyKSHiju1  192.168.2.76
+                    CT0JIh479jXIGt0Po1 192.168.2.76
+                    C6Q4Vm14ZJIlZhsXqk 192.168.2.76
+         1s070      CtgxRAqDLvrRUQdqe  192.168.2.76
+           200      C6nSoj1Qco9PGyslz6 192.168.2.76
+        23s044      CN5hnY3x51j6Hr1v4  192.168.2.76
+                    CdZUPH2DKOE7zzCLE3 192.168.2.76
+        32s388      CmWpC33jXuKpXNLcie 192.168.2.76
+                    CsBgiE1WmGP4Yo749h 192.168.2.76
+           657      CYfHyC28tAhkLYkXB7 192.168.2.76
+                    CtANmVrHYMtkWqPE5  192.168.2.76
+           647      CSTH8n1O1nv0ztxNQd 192.168.2.76
+                    C4uDKU5tpeRU9Su19  192.168.2.76
+                    CEh6Ka2HInkNSH01L2 192.168.2.76
+         4s840      CjPGiy13ncXKxU765j 192.168.2.76
+         6s895      CPoz7NUpXISemlNSd  192.168.2.76
+         6s837      Ct6ixh35y9AEr7J7o9 192.168.2.76
+         6s889      CaEFHq2HVQ5iGJQiD9 192.168.2.76
+         6s875      CjinlH2fzDtvzI9637 192.168.2.76
+         6s884      Cedw7H3ddE2yLiLoXc 192.168.2.76
+         6s917      CAUlC249svUfE6q0g3 192.168.2.76
+                    CIJIDL1ULo4HpT24Gl 192.168.2.76
+           016      CLsqp41RLUd83arUQb 192.168.2.76
+           166      CbCciH11995WKkobR1 192.168.2.76
+           457      ClcvKE1dqsEFQu46m9 192.168.2.76
+                    CaP2LpLGvsmX7yJO   192.168.2.76
+           043      CNbPns4mOMGgjI8Ele 192.168.2.76
+           557      C185u7u9Q4qhJPhzl  192.168.2.76
+           129      CKzjfhsJ8vrn2rrfg  192.168.2.76
+           562      CiIjAe1n5MnPOVpQ9f 192.168.2.76
+                    CGv2Tp4Ngt8MmKmVRd 192.168.2.76
+         7s071      C5DisEMFU77Wk9Kae  192.168.2.76
+                    Cs5yEZ3ELZTeuTOsP4 192.168.2.76
+         4s667      Cu4gIx1BDNtGOl7Ht2 192.168.2.76
+         1s288      CRgW2I2zo3SInm6iT8 192.168.2.76
+                    CWJhMU2cTLEnseTmCb 192.168.2.76
+           042      CejI402rKGtdBXij4f 192.168.2.76
+                    C2KnU34GcVV6amo8va 192.168.2.76
+                    C5vx4911iSMAJuShFd 192.168.2.76
+                    CbUCgw1DrIGcXzONB7 192.168.2.76
+           502      C96j2X1DixgLTj2Oi8 192.168.2.76
+                    CYYyja3FFNEnftw3K6 192.168.2.76
+                █   CBHHuR1xFnm5C5CQBc 192.168.2.76
+                    CD1jfU3p9abEm77mzf 192.168.2.76
+                    C0K9DaoPFkfnzwlZa  192.168.2.76
+           616      CbQAWi3GX2bCmX5L56 192.168.2.76
+           298      Cd8s2R3OGDgkhnvSu9 192.168.2.76
+           205      CBeaXe4Iyj1gXd2Iq  192.168.2.76
+                    CmWpSw3VtjiAceBCwf 192.168.2.76
+      1m12s201      CbNCgO1MzloHRNeY4f 192.168.2.76
+           315      CX1GjC4vn52UY1uDv6 192.168.2.76
+                    CaPClb1Bf0RrRGtyWi 192.168.2.76
+        35s642      CibfNy1QQW4ImDWRq5 192.168.2.76
+      1m11s547      CTRXSR3blXJE5ZE7Ij 192.168.2.76
+      1m11s536      CnGze54kQWWpKqrrZ4 192.168.2.76
+        12s337      C3TZMB4CrUwYfkGJy1 192.168.2.76
+                    CK957ERTz8lBycly4  192.168.2.76
+         1s309      CO5QKYQkcSdxQFA35  192.168.2.76
+                    CurHpb1TGZOktTRNP1 192.168.2.76
+                    CuUKOQ1R3CqKBgeTdf 192.168.2.76
+                    C3xkHgJnzZszVSTpi  192.168.2.76
+                    CMrjgF2XLmRh9C9TR4 192.168.2.76
+                    C2vQ8sVgyADHjtEda  192.168.2.76
+                    CD69521bDXIAb4IkW  192.168.2.76
+         6s648      CC3vUI3gFB04zLvWRa 192.168.2.76
+         2s666      C7Krri4g9tZfHniGXh 192.168.2.76
+                    CmxyBl2c8XAMTuHEk4 192.168.2.76
+           499      CSvs6v26bQqFylkk6l 192.168.2.76
+                    C4pHul1H3OeWYz7o7i 192.168.2.76
+                    C7Lcvr4vsTf6eYpBva 192.168.2.76
+                    CV8faD4L1sLL5kDwN9 192.168.2.76
+                    CxyAKs10ppnHFP6O8i 192.168.2.76
+                    C6MrHk2C7rLuJqhjsg 192.168.2.76
+                    CvfUrT2DgYXXoZw9Ah 192.168.2.76
+                    CBX0254QJoklXNbvv2 192.168.2.76
+                    C6Ym6jvMgikT0xTTc  192.168.2.76
+                    CRNn9f1zKNlzHSM5pa 192.168.2.76
+                    CJLgi92kpp2gLgGTE5 192.168.2.76

test/expected/test_gantt.sh_cde7947f361e5f3d4cd1bbc3f7458f426b6a8eb4.out

@@ -0,0 +1,4 @@
+ 2011-11-03T00:19:26.452         2011-11-03T00:21:13.204
+     2011-11-03T00:17:00.000 2011-11-03T00:22:00.000
+   Duration   | ✘▲ | Operation
+                    CdysLK1XpcrXOpVDuh 192.168.2.76

test/test_gantt.sh

@@ -6,4 +6,18 @@ export TZ=UTC
 
 run_cap_test ${lnav_test} -n \
     -c ':switch-to-view gantt' \
+    ${test_dir}/logfile_generic.0
+
+run_cap_test ${lnav_test} -n \
+    -c ':switch-to-view gantt' \
+    ${test_dir}/logfile_bro_http.log.0
+
+run_cap_test ${lnav_test} -n \
+    -c ':switch-to-view gantt' \
+    -c ':filter-in CdysLK1XpcrXOpVDuh' \
+    ${test_dir}/logfile_bro_http.log.0
+
+run_cap_test ${lnav_test} -n \
+    -c ':switch-to-view gantt' \
+    -c ':filter-out CdysLK1XpcrXOpVDuh' \
     ${test_dir}/logfile_bro_http.log.0