Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 21:44:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Stop using a static vector for timers

Browse source 
This is thread unsafe. Just use a captured local variable instead.
This commit is contained in:
ridiculousfish 2022-08-21 15:30:13 -07:00
parent 3eae0a9b6a
commit aaf50099f2
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/timer.cpp
View file

@ -194,11 +194,7 @@ wcstring timer_snapshot_t::print_delta(const timer_snapshot_t &t1, const timer_s
return output;
};
static std::vector<timer_snapshot_t> active_timers;
static void pop_timer() {
auto t1 = active_timers.back();
active_timers.pop_back();
static void timer_finished(const timer_snapshot_t &t1) {
auto t2 = timer_snapshot_t::take();
// Well, this is awkward. By defining `time` as a decorator and not a built-in, there's
@ -209,6 +205,7 @@ static void pop_timer() {
cleanup_t push_timer(bool enabled) {
if (!enabled) return {[] {}};
active_timers.emplace_back(timer_snapshot_t::take());
return {[] { pop_timer(); }};
auto t1 = timer_snapshot_t::take();
return {[=] { timer_finished(t1); }};
}