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

Optimize pruning of job/proc exit handlers

Browse Source 
Pre-emptively delete the handler while we have possession of the lock
before calling the event itself. It's crude, but it works.
This commit is contained in:
Mahmoud Al-Qudsi 2021-03-05 22:40:06 -06:00
parent e7398c0248
commit 11951a245f
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/event.cpp
View File

@ -269,8 +269,24 @@ static void event_fire_internal(parser_t &parser, const event_t &event) {
// TODO: this is kind of crazy. We want to support removing (and thereby suppressing) an
// event handler from another, but we also don't want to hold the lock across callouts. How
// can we make this less silly?
if (!contains(*s_event_handlers.acquire(), handler)) {
continue;
{
auto event_handlers = s_event_handlers.acquire();
if (!contains(*event_handlers, handler)) {
continue;
}
// Delete the event before firing it so we don't have to lock and unlock the event
// handlers list when handing control off to the handler.
if (firing_event.delete_after_call) {
FLOGF(event, L"Pruning handler '%ls' before firing", event.desc.str_param1.c_str());
for (auto event_handler = event_handlers->begin();
event_handler != event_handlers->end(); ++event_handler) {
if (event_handler->get() == firing_event.handler.get()) {
event_handlers->erase(event_handler);
break;
}
}
}
}
// Construct a buffer to evaluate, starting with the function name and then all the
@ -291,18 +307,6 @@ static void event_fire_internal(parser_t &parser, const event_t &event) {
parser.eval(buffer, io_chain_t());
parser.pop_block(b);
parser.set_last_statuses(std::move(prev_statuses));
if (firing_event.delete_after_call) {
FLOGF(event, L"Deleting event '%ls'", event.desc.str_param1.c_str());
auto event_handlers = s_event_handlers.acquire();
for (auto event_handler = event_handlers->begin();
event_handler != event_handlers->end(); ++event_handler) {
if (event_handler->get() == firing_event.handler.get()) {
event_handlers->erase(event_handler);
break;
}
}
}
}
}