github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 12:52:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add flog logging to history

Browse Source
This commit is contained in:
ridiculousfish 2019-08-15 13:42:23 -07:00
parent 332b305f81
commit 7ab291775a
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/flog.h
View File

@ -72,6 +72,8 @@ class category_list_t {
category_t topic_monitor{L"topic-monitor", L"Internal details of the topic monitor"};
category_t char_encoding{L"char-encoding", L"Character encoding issues"};
category_t history{L"history", L"Command history events"};
};
/// The class responsible for logging.

9
src/history.cpp
View File

@ -541,6 +541,8 @@ void history_impl_t::populate_from_file_contents() {
old_item_offsets.push_back(*offset);
}
}
FLOGF(history, "Loaded %lu old items", old_item_offsets.size());
}
void history_impl_t::load_old_if_needed() {
@ -739,6 +741,8 @@ static int create_temporary_file(const wcstring &name_template, wcstring *out_pa
}
bool history_impl_t::save_internal_via_rewrite() {
FLOGF(history, "Saving %lu items via rewrite",
new_items.size() - first_unwritten_new_item_index);
bool ok = false;
// We want to rewrite the file, while holding the lock for as briefly as possible
@ -847,6 +851,8 @@ bool history_impl_t::save_internal_via_rewrite() {
// Function called to save our unwritten history file by appending to the existing history file
// Returns true on success, false on failure.
bool history_impl_t::save_internal_via_appending() {
FLOGF(history, "Saving %lu items via appending",
new_items.size() - first_unwritten_new_item_index);
// No deleting allowed.
assert(deleted_items.empty());
@ -972,6 +978,9 @@ void history_impl_t::save(bool vacuum) {
if (!vacuum && deleted_items.empty()) {
// Try doing a fast append.
ok = save_internal_via_appending();
if (!ok) {
FLOGF(history, "Appending failed");
}
}
if (!ok) {
// We did not or could not append; rewrite the file ("vacuum" it).