[session] store breakpoints

Author: tstack

src/logfile_sub_source.cc

@@ -63,6 +63,8 @@
 #include "scn/scan.h"
 #include "shlex.hh"
 #include "sql_util.hh"
+#include "sqlitepp.hh"
+#include "sqlitepp.client.hh"
 #include "tlx/container/btree_set.hpp"
 #include "vtab_module.hh"
 #include "yajlpp/yajlpp.hh"
@@ -3657,6 +3659,21 @@ logfile_sub_source::add_commands_for_session(
             }
         }
     }
+
+    {
+        static auto& lnav_db = injector::get<auto_sqlite3&>();
+        static const auto BP_QUERY = R"(
+                            SELECT description FROM lnav_log_breakpoints
+                        )";
+        auto bp_stmt = prepare_stmt(lnav_db.in(), BP_QUERY);
+        if (bp_stmt.isOk()) {
+            auto stmt = bp_stmt.unwrap();
+            stmt.for_each_row<std::string>([&](const std::string& desc) {
+                receiver(fmt::format(FMT_STRING("breakpoint {}"), desc));
+                return false;
+            });
+        }
+    }
 }
 
 void

src/session_data.cc

@@ -2090,6 +2090,13 @@ reset_session()
     }
 
     // XXX clean this up
+    {
+        auto del_res = prepare_stmt(lnav_data.ld_db.in(),
+                                    "DELETE FROM lnav_log_breakpoints");
+        if (del_res.isOk()) {
+            del_res.unwrap().execute();
+        }
+    }
     lnav_data.ld_log_source.lss_highlighters.clear();
     lnav_data.ld_log_source.set_force_rebuild();
     lnav_data.ld_log_source.set_marked_only(false);

test/expected/Makefile.am

@@ -734,8 +734,12 @@ dist_noinst_DATA = \
     test_sessions.sh_639b83ce8f67975dfdc7086946ec287b43b6fa8c.out \
     test_sessions.sh_68a89b56c5e7f7db620084cca1eb547cbb19a2c9.err \
     test_sessions.sh_68a89b56c5e7f7db620084cca1eb547cbb19a2c9.out \
+    test_sessions.sh_6c6038294702aefea639f8669cd9a044bd744e18.err \
+    test_sessions.sh_6c6038294702aefea639f8669cd9a044bd744e18.out \
     test_sessions.sh_6d87ff483d5785c58fb271a405ff1c35e4f83cd9.err \
     test_sessions.sh_6d87ff483d5785c58fb271a405ff1c35e4f83cd9.out \
+    test_sessions.sh_72ccbbeb0bc5d74d4f2b3cd09da9ff15af591aa4.err \
+    test_sessions.sh_72ccbbeb0bc5d74d4f2b3cd09da9ff15af591aa4.out \
     test_sessions.sh_7f4805745c6551e9f3ecbb809ffb4cfe8bce9c6f.err \
     test_sessions.sh_7f4805745c6551e9f3ecbb809ffb4cfe8bce9c6f.out \
     test_sessions.sh_858fd0081ed9c46dd81e2f81f1090756f2463558.err \

test/expected/test_sessions.sh_6c6038294702aefea639f8669cd9a044bd744e18.err

@@ -0,0 +1,2 @@
+description
+glog_log:logging_unittest.cc:259

test/expected/test_sessions.sh_6c6038294702aefea639f8669cd9a044bd744e18.out

@@ -227,6 +227,22 @@ run_cap_test ${lnav_test} -nq \
 rm -rf ./sessions
 mkdir -p $HOME
 
+# breakpoint saved in session
+run_cap_test ${lnav_test} -nq \
+    -c ":breakpoint logging_unittest.cc:259" \
+    -c ":save-session" \
+    ${test_dir}/logfile_glog.0
+
+# breakpoint restored from session
+run_cap_test ${lnav_test} -n \
+    -c ":load-session" \
+    -c ";SELECT description FROM lnav_log_breakpoints" \
+    -c ":write-csv-to -" \
+    ${test_dir}/logfile_glog.0
+
+rm -rf ./sessions
+mkdir -p $HOME
+
 # sticky header saved in session for text file
 run_cap_test ${lnav_test} -n \
     -c ':goto 1' \