[perf] disable extra compression in line_buffer for non-logfile uses

Author: tstack

src/file_format.cc

@@ -44,6 +44,8 @@
 detect_file_format_result
 detect_file_format(const std::filesystem::path& filename)
 {
+    // static auto op = lnav_operation{"detect_file_format"};
+    // auto op_guard = lnav_opid_guard::internal(op);
     log_trace("detecting format of file: %s", filename.c_str());
 
     detect_file_format_result retval = {file_format_t::UNKNOWN};

src/files_sub_source.cc

@@ -521,10 +521,6 @@ files_sub_source::text_update_marks(vis_bookmarks& bm)
         }
         index += 1_vl;
     }
-
-    log_debug("files bookmarks errors=%zu; warnings=%zu",
-              bm_errs.size(),
-              bm_warn.size());
 }
 
 void

src/line_buffer.cc

@@ -471,7 +471,9 @@ line_buffer::set_fd(auto_fd& fd)
                     if (!hdr.empty()) {
                         this->lb_header = std::move(hdr);
                     }
-                    this->resize_buffer(INITIAL_COMPRESSED_BUFFER_SIZE);
+                    if (this->lb_decompress_extra) {
+                        this->resize_buffer(INITIAL_COMPRESSED_BUFFER_SIZE);
+                    }
                 }
 #ifdef HAVE_BZLIB_H
                 else if (gz_id[0] == 'B' && gz_id[1] == 'Z')
@@ -486,7 +488,9 @@ line_buffer::set_fd(auto_fd& fd)
                      * Loading data from a bzip2 file is pretty slow, so we try
                      * to keep as much in memory as possible.
                      */
-                    this->resize_buffer(INITIAL_COMPRESSED_BUFFER_SIZE);
+                    if (this->lb_decompress_extra) {
+                        this->resize_buffer(INITIAL_COMPRESSED_BUFFER_SIZE);
+                    }
 
                     this->lb_compressed_offset = 0;
                 }
@@ -1038,7 +1042,9 @@ line_buffer::fill_range(file_off_t start,
                      * For compressed files, increase the buffer size so we
                      * don't have to spend as much time uncompressing the data.
                      */
-                    this->resize_buffer(MAX_COMPRESSED_BUFFER_SIZE);
+                    if (this->lb_decompress_extra) {
+                        this->resize_buffer(MAX_COMPRESSED_BUFFER_SIZE);
+                    }
                 }
                 break;
 
@@ -1298,6 +1304,9 @@ line_buffer::load_next_line(file_range prev_line)
 
             offset += retval.li_file_range.fr_size;
 
+            done = true;
+        } else if (!retval.li_utf8_scan_result.is_valid()) {
+            retval.li_partial = true;
             done = true;
         } else {
             if (!this->is_pipe() || !this->is_pipe_closed()) {

src/line_buffer.hh

@@ -99,7 +99,7 @@ public:
         gz_indexed(gz_indexed&& other) = default;
         ~gz_indexed() { this->close(); }
 
-        inline operator bool() const { return this->gz_fd != -1; }
+        operator bool() const { return this->gz_fd != -1; }
 
         uLong get_source_offset() const
         {
@@ -149,6 +149,11 @@ public:
 
     bool get_do_preloading() const { return this->lb_do_preloading; }
 
+    bool set_decompress_extra(bool value)
+    {
+        return this->lb_decompress_extra = value;
+    }
+
     /** @param fd The file descriptor that data should be pulled from. */
     void set_fd(auto_fd& fd);
 
@@ -388,6 +393,7 @@ private:
     time_t lb_file_time{0};
     bool lb_seekable{false}; /*< Flag set for seekable file descriptors. */
     bool lb_compressed{false};
+    bool lb_decompress_extra{false};
     bool lb_is_utf8{true};
     bool lb_do_preloading{false};
     file_off_t lb_last_line_offset{-1}; /*< */

src/logfile.cc

@@ -247,6 +247,7 @@ logfile::logfile(std::filesystem::path filename,
     : lf_filename(std::move(filename)),
       lf_filename_as_string(lf_filename.string()), lf_options(loo)
 {
+    this->lf_line_buffer.set_decompress_extra(true);
     this->lf_opids.writeAccess()->los_opid_ranges.reserve(64);
     this->lf_thread_ids.writeAccess()->ltis_tid_ranges.reserve(64);
 }
@@ -1093,6 +1094,9 @@ logfile::rebuild_index(std::optional<ui_clock::time_point> deadline)
     static const auto& dts_cfg
         = injector::get<const date_time_scanner_ns::config&>();
 
+    static auto op = lnav_operation{"rebuild_file_index"};
+    auto op_guard = lnav_opid_guard::internal(op);
+
     if (!this->lf_invalidated_opids.empty()) {
         auto writeOpids = this->lf_opids.writeAccess();