[timeline] add files and threads

Author: tstack

NEWS.md

@@ -185,14 +185,17 @@ Interface changes:
   close the completion popup, it was too easy to
   cancel the prompt.  Pressing `CTRL+]` will still
   close the prompt immediately.
-* The TIMELINE view header has been redesigned to be
-  one line that shows the time increments at the
-  current scale.  This approach should more clearly
-  convey the spans of time shown in the main part of the
-  view.  The previous design tried to show the overall
-  time and the current time frame.  But, the multi-line
-  header was hard to interpret and didn't make it clear
-  how large the time increments were.
+* The TIMELINE view has a few updates:
+  - The header has been redesigned to be one line that
+    shows the time increments at the current scale.
+    This approach should more clearly convey the spans
+    of time shown in the main part of the view.  The
+    previous design tried to show the overall time and
+    the current time frame.  But, the multi-line header
+    was hard to interpret and didn't make it clear how
+    large the time increments were.
+  - Log files and threads are now shown in the view
+    in addition to operations.
 * The HIST view now shows the year and inserts a spacer
   row in-between gaps in time.  The spacer row shows
   bullet points on a log scale to represent the amount

docs/schemas/config-v1.schema.json

@@ -522,6 +522,16 @@
                                             "description": "Icon for a 'edit' button",
                                             "title": "/ui/theme-defs/<theme_name>/icons/edit",
                                             "$ref": "#/definitions/icon"
+                                        },
+                                        "file": {
+                                            "description": "Icon for files",
+                                            "title": "/ui/theme-defs/<theme_name>/icons/file",
+                                            "$ref": "#/definitions/icon"
+                                        },
+                                        "thread": {
+                                            "description": "Icon for threads",
+                                            "title": "/ui/theme-defs/<theme_name>/icons/thread",
+                                            "$ref": "#/definitions/icon"
                                         }
                                     },
                                     "additionalProperties": false

docs/source/ui.rst

@@ -424,9 +424,9 @@ TIMELINE
    VMWare Update Manager.  Most rows show API requests as they
    are received and processed.
 
-The timeline view [#]_ visualizes operations over time.  The operations
-are ordered top-to-bottom by their start time.  So, scrolling down will
-move forward in time.  An operation is identified by an ID that can come
+The timeline view [#]_ visualizes log files, threads, and operations over time.
+The items are ordered top-to-bottom by their start time.  So, scrolling down
+will move forward in time.  An operation is identified by an ID that can come
 from multiple sources:
 
 * If the ID is in the log message, the log format can set the

src/base/attr_line.cc

@@ -272,6 +272,19 @@ attr_line_t::with_ansi_string(const string_fragment& str)
     return *this;
 }
 
+attr_line_t&
+attr_line_t::append(ui_icon_t value)
+{
+    size_t start_len = this->al_string.length();
+
+    this->al_string.append("  ");
+    line_range lr{(int) start_len, (int) this->al_string.length()};
+
+    this->al_attrs.emplace_back(lr, VC_ICON.value(value));
+
+    return *this;
+}
+
 namespace text_stream {
 struct word {
     string_fragment w_word;

src/base/attr_line.hh

@@ -292,6 +292,8 @@ public:
         return *this;
     }
 
+    attr_line_t& append(ui_icon_t value);
+
     template<typename S>
     attr_line_t& append(S str, const string_attr_pair& value)
     {
@@ -343,6 +345,16 @@ public:
         return *this;
     }
 
+    template<typename T>
+    attr_line_t& append(const std::optional<T> &value)
+    {
+        if (value) {
+            this->append(*value);
+        }
+
+        return *this;
+    }
+
     template<typename S>
     attr_line_t& append_quoted(const std::pair<S, string_attr_pair>& value)
     {

src/base/lnav.console.cc

@@ -514,6 +514,10 @@ wchar_for_icon(ui_icon_t ic)
             return {U'\u25b6', role_t::VCR_TEXT};
         case ui_icon_t::edit:
             return {U'\u270f', role_t::VCR_TEXT};
+        case ui_icon_t::file:
+            return {U'\U0001f4c4', role_t::VCR_TEXT};
+        case ui_icon_t::thread:
+            return {U'\U0001F9F5', role_t::VCR_TEXT};
     }
 
     ensure(false);

src/base/string_attr_type.hh

@@ -67,9 +67,11 @@ enum class ui_icon_t : int32_t {
 
     play,
     edit,
+    file,
+    thread,
 };
 
-constexpr auto ui_icon_count = lnav::enums::to_underlying(ui_icon_t::edit) + 1;
+constexpr auto ui_icon_count = lnav::enums::to_underlying(ui_icon_t::thread) + 1;
 
 /** Roles that can be mapped to curses attributes using attrs_for_role() */
 enum class role_t : int32_t {

src/file_vtab.cc

@@ -43,6 +43,7 @@
 #include "log_format.hh"
 #include "logfile.hh"
 #include "session_data.hh"
+#include "text_format.hh"
 #include "vtab_module.hh"
 #include "vtab_module_json.hh"
 

src/line_buffer.cc

@@ -633,10 +633,12 @@ line_buffer::load_next_buffer()
     ssize_t rc = 0;
     safe::WriteAccess<safe_gz_indexed> gi(this->lb_gz_file);
 
+#if 0
     log_debug("BEGIN fd(%d) preload read of %zu at %lld",
               this->lb_fd.get(),
               this->lb_alt_buffer.value().available(),
               start + this->lb_alt_buffer->size());
+#endif
     /* ... read in the new data. */
     if (!this->lb_cached_fd && *gi) {
         if (this->lb_file_size != (ssize_t) -1 && this->in_range(start)
@@ -781,7 +783,6 @@ line_buffer::load_next_buffer()
             retval = true;
             break;
     }
-    // log_debug("END preload read");
 
     if (start > this->lb_last_line_offset) {
         const auto* line_start = this->lb_alt_buffer.value().begin();
@@ -808,7 +809,7 @@ line_buffer::load_next_buffer()
         } while (line_start != nullptr
                  && line_start < this->lb_alt_buffer->end());
     }
-    log_debug("END preload read");
+    // log_debug("END preload read");
 
     return retval;
 }

src/lnav_config.cc

@@ -715,6 +715,14 @@ static const json_path_container theme_icons_handlers = {
         .with_description("Icon for a 'edit' button")
         .for_child(&lnav_theme::lt_icon_edit)
         .with_children(icon_config_handlers),
+    yajlpp::property_handler("file")
+        .with_description("Icon for files")
+        .for_child(&lnav_theme::lt_icon_file)
+        .with_children(icon_config_handlers),
+    yajlpp::property_handler("thread")
+        .with_description("Icon for threads")
+        .for_child(&lnav_theme::lt_icon_thread)
+        .with_children(icon_config_handlers),
 };
 
 static const struct json_path_container theme_styles_handlers = {