github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-27 14:45:13 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Minor allocation reduction in format_history_record

Browse Source 
Reuse some storage across calls.
This commit is contained in:
ridiculousfish 2019-11-02 18:27:35 -07:00
parent 72bf5898d3
commit be35b858c5
2 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/history.cpp
View File

@ -612,15 +612,12 @@ bool history_search_t::go_backwards() {
return false; return false;
} }
history_item_t history_search_t::current_item() const { const history_item_t &history_search_t::current_item() const {
assert(current_item_ && "No current item"); assert(current_item_ && "No current item");
return *current_item_; return *current_item_;
} }
wcstring history_search_t::current_string() const { const wcstring &history_search_t::current_string() const { return this->current_item().str(); }
history_item_t item = this->current_item();
return item.str();
}
static wcstring history_filename(const wcstring &session_id, const wcstring &suffix) { static wcstring history_filename(const wcstring &session_id, const wcstring &suffix) {
if (session_id.empty()) return L""; if (session_id.empty()) return L"";
@ -993,7 +990,8 @@ void history_impl_t::save(bool vacuum) {
// Returns nothing. The only possible failure involves formatting the timestamp. If that happens we // Returns nothing. The only possible failure involves formatting the timestamp. If that happens we
// simply omit the timestamp from the output. // simply omit the timestamp from the output.
static void format_history_record(const history_item_t &item, const wchar_t *show_time_format, static void format_history_record(const history_item_t &item, const wchar_t *show_time_format,
bool null_terminate, wcstring &result) { bool null_terminate, wcstring *result) {
result->clear();
if (show_time_format) { if (show_time_format) {
const time_t seconds = item.timestamp(); const time_t seconds = item.timestamp();
struct tm timestamp; struct tm timestamp;
@ -1002,17 +1000,13 @@ static void format_history_record(const history_item_t &item, const wchar_t *sho
wchar_t timestamp_string[max_tstamp_length + 1]; wchar_t timestamp_string[max_tstamp_length + 1];
if (std::wcsftime(timestamp_string, max_tstamp_length, show_time_format, &timestamp) != if (std::wcsftime(timestamp_string, max_tstamp_length, show_time_format, &timestamp) !=
0) { 0) {
result.append(timestamp_string); result->append(timestamp_string);
} }
} }
} }
result.append(item.str()); result->append(item.str());
if (null_terminate) { result->push_back(null_terminate ? L'\0' : L'\n');
result.push_back(L'\0');
} else {
result.push_back(L'\n');
}
} }
void history_impl_t::disable_automatic_saving() { void history_impl_t::disable_automatic_saving() {
@ -1364,20 +1358,20 @@ bool history_t::search(history_search_type_t search_type, const wcstring_list_t
size_t hist_size = this->size(); size_t hist_size = this->size();
if (max_items > hist_size) max_items = hist_size; if (max_items > hist_size) max_items = hist_size;
wcstring formatted_record;
if (reverse) { if (reverse) {
for (size_t i = max_items; i != 0; --i) { for (size_t i = max_items; i != 0; --i) {
auto cur_item = this->item_at_index(i); auto cur_item = this->item_at_index(i);
wcstring result; format_history_record(cur_item, show_time_format, null_terminate, &formatted_record);
format_history_record(cur_item, show_time_format, null_terminate, result); streams.out.append(formatted_record);
streams.out.append(result);
} }
} else { } else {
// Start at one because zero is the current command. // Start at one because zero is the current command.
for (size_t i = 1; i < max_items + 1; ++i) { for (size_t i = 1; i < max_items + 1; ++i) {
auto cur_item = this->item_at_index(i); auto cur_item = this->item_at_index(i);
wcstring result; wcstring result;
format_history_record(cur_item, show_time_format, null_terminate, result); format_history_record(cur_item, show_time_format, null_terminate, &formatted_record);
streams.out.append(result); streams.out.append(formatted_record);
} }
} }
@ -1400,14 +1394,14 @@ bool history_t::search_with_args(history_search_type_t search_type,
} }
history_search_t searcher = history_search_t( history_search_t searcher = history_search_t(
*this, search_string, search_type, case_sensitive ? 0 : history_search_ignore_case); *this, search_string, search_type, case_sensitive ? 0 : history_search_ignore_case);
wcstring formatted_record;
while (searcher.go_backwards()) { while (searcher.go_backwards()) {
wcstring result; const auto &cur_item = searcher.current_item();
auto cur_item = searcher.current_item(); format_history_record(cur_item, show_time_format, null_terminate, &formatted_record);
format_history_record(cur_item, show_time_format, null_terminate, result);
if (reverse) { if (reverse) {
results.push_back(result); results.push_back(formatted_record);
} else { } else {
streams.out.append(result); streams.out.append(formatted_record);
} }
if (--max_items == 0) break; if (--max_items == 0) break;
} }

4
src/history.h
View File

@ -257,10 +257,10 @@ class history_search_t {
bool go_backwards(); bool go_backwards();
// Returns the current search result item. asserts if there is no current item. // Returns the current search result item. asserts if there is no current item.
history_item_t current_item() const; const history_item_t &current_item() const;
// Returns the current search result item contents. asserts if there is no current item. // Returns the current search result item contents. asserts if there is no current item.
wcstring current_string() const; const wcstring &current_string() const;
// Constructor. // Constructor.
history_search_t(history_t &hist, const wcstring &str, history_search_t(history_t &hist, const wcstring &str,