github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-26 10:43:47 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Use thread-local vectors for caching peeked events

Browse Source 
These functions are called in the event queue hot path every time an
input event takes place. If we could guarantee a maximum length of
non-char (i.e. readline) events in the queue, we could use
`event_queue_peeker_t` with a fixed storage size of, e.g., 32 events,
but I'm not sure what a reasonable number would in fact be, so I'm just
changing these to use a thread-local vector that will re-use its
previous heap allocation in subsequent invocations rather than thrashing
the heap.
This commit is contained in:
Mahmoud Al-Qudsi 2021-02-08 12:09:22 -06:00
parent 2c1764fd45
commit 2df16b53ff
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/input.cpp
View File

@ -340,7 +340,9 @@ wchar_t inputter_t::function_pop_arg() {
void inputter_t::function_push_args(readline_cmd_t code) {
int arity = input_function_arity(code);
std::vector<char_event_t> skipped;
// Use a thread-local to prevent constant heap thrashing in the main input loop
static FISH_THREAD_LOCAL std::vector<char_event_t> skipped;
skipped.clear();
for (int i = 0; i < arity; i++) {
// Skip and queue up any function codes. See issue #2357.
@ -587,7 +589,11 @@ void inputter_t::mapping_execute_matching_or_generic(const command_handler_t &co
/// Helper function. Picks through the queue of incoming characters until we get to one that's not a
/// readline function.
char_event_t inputter_t::read_characters_no_readline() {
std::vector<char_event_t> saved_events;
// Use a thread-local vector to prevent repeated heap allocation, as this is called in the main
// input loop.
static FISH_THREAD_LOCAL std::vector<char_event_t> saved_events;
saved_events.clear();
char_event_t evt_to_return{0};
for (;;) {
auto evt = event_queue_.readch();