[breakpoints] move breakpoints into logfile_sub_source

Author: tstack

NEWS.md

@@ -96,17 +96,16 @@ Features:
     `:clear-breakpoints` commands have been added to
     support setting/clearing breakpoints for log messages.
     The `CTRL-B` shortcut toggles a breakpoint on the
-    focused line in the LOG view.  Also, if the log
-    format specifies source file/line fields, the first
-    character of the source file will be underlined and
-    can be clicked to toggle a breakpoint.  Once
-    breakpoints have been added, you can press `F7`/`F8`
-    to move to the previous/next log message that
-    matches a breakpoint.
-  - If the log format specifies source file/line fields,
-    the first character of the source file will be
-    underlined and can be clicked to open the source
-    file at the given log message.
+    focused line in the LOG view.  Once breakpoints have
+    been added, you can press `F7`/`F8` to move to the
+    previous/next log message that matches a breakpoint.
+  - If the log format specifies source file/line fields
+    and a breakpoint is set, a red bullet point will be
+    inserted to signify the presence of a breakpoint.
+    In addition, if the `:add-source-path` command has
+    been used, the first character of the source file
+    will be underlined and can be clicked to open the
+    source file at the given log message.
 * The `all_opids` and `all_thread_ids` virtual tables
   have been added to make it simple to discover all of
   the operations and threads across all log files.  The

docs/schemas/config-v1.schema.json

@@ -513,6 +513,16 @@
                                             "title": "/ui/theme-defs/<theme_name>/icons/log-level-fatal",
                                             "$ref": "#/definitions/icon"
                                         },
+                                        "breakpoint": {
+                                            "description": "Icon for a breakpoint marker",
+                                            "title": "/ui/theme-defs/<theme_name>/icons/breakpoint",
+                                            "$ref": "#/definitions/icon"
+                                        },
+                                        "disabled-breakpoint": {
+                                            "description": "Icon for a disabled breakpoint marker",
+                                            "title": "/ui/theme-defs/<theme_name>/icons/disabled-breakpoint",
+                                            "$ref": "#/definitions/icon"
+                                        },
                                         "play": {
                                             "description": "Icon for a 'play' button",
                                             "title": "/ui/theme-defs/<theme_name>/icons/play",

src/CMakeLists.txt

@@ -535,6 +535,7 @@ add_library(
         db_sub_source.cc
         dump_internals.cc
         elem_to_json.cc
+        breakpoint_vtab.cc
         environ_vtab.cc
         ext.longpoll.cc
         extension-functions.cc

src/Makefile.am

@@ -617,6 +617,7 @@ libdiag_a_SOURCES = \
 
 PLUGIN_SRCS = \
 	all_ids_vtabs.cc \
+	breakpoint_vtab.cc \
 	file_vtab.cc
 
 if HAVE_WINDRES

src/all_ids_vtabs.cc

@@ -364,5 +364,3 @@ auto all_vtabs_binder = injector::bind_multiple<vtab_module_base>()
                             .add<vtab_module<tvt_no_update<all_thread_ids>>>();
 
 }  // namespace
-
-DIST_SLICE(inject_bind) int lnav_all_ids = 3;

src/base/attr_line.cc

@@ -285,6 +285,19 @@ attr_line_t::append(ui_icon_t value)
     return *this;
 }
 
+attr_line_t&
+attr_line_t::insert(size_t index, ui_icon_t value)
+{
+    size_t start_len = this->al_string.length();
+
+    this->insert(index, "  ");
+    line_range lr{(int) index, (int) index + 2};
+
+    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

@@ -294,6 +294,8 @@ public:
 
     attr_line_t& append(ui_icon_t value);
 
+    attr_line_t& insert(size_t index, ui_icon_t value);
+
     template<typename S>
     attr_line_t& append(S str, const string_attr_pair& value)
     {

src/base/humanize.cc

@@ -66,6 +66,9 @@ try_from(const string_fragment& sf)
     if (md[integer]) {
         auto scan_res = scn::scan_value<int64_t>(md[integer]->to_string_view());
 
+        if (!scan_res) {
+            return std::nullopt;
+        }
         return scan_res->value();
     }
 

src/base/lnav.console.cc

@@ -517,7 +517,10 @@ wchar_for_icon(ui_icon_t ic)
             return {U'\U0001F132', role_t::VCR_ERROR};
         case ui_icon_t::log_level_fatal:
             return {U'\U0001F135', role_t::VCR_ERROR};
-
+        case ui_icon_t::breakpoint:
+            return {U'\u25CF', role_t::VCR_ERROR};
+        case ui_icon_t::disabled_breakpoint:
+            return {U'\u25CB', role_t::VCR_WARNING};
         case ui_icon_t::play:
             return {U'\u25b6', role_t::VCR_TEXT};
         case ui_icon_t::edit:

src/base/string_attr_type.hh

@@ -65,6 +65,9 @@ enum class ui_icon_t : int32_t {
     log_level_critical,
     log_level_fatal,
 
+    breakpoint,
+    disabled_breakpoint,
+
     play,
     edit,
     file,