Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-28 13:53:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Stop using unique_ptr to store histories

Browse source 
These register shutdown dtors, which cause tsan to complain.
This commit is contained in:
ridiculousfish 2021-01-08 14:14:05 -08:00
parent bee8e8f6f7
commit 6f91195f40
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/history.cpp
View file

@ -1481,8 +1481,8 @@ history_item_t history_t::item_at_index(size_t idx) { return impl()->item_at_ind
size_t history_t::size() { return impl()->size(); } size_t history_t::size() { return impl()->size(); }
/// The set of all histories. /// The set of all histories. These are deliberately leaked to avoid shutdown dtors.
static owning_lock<std::map<wcstring, std::unique_ptr<history_t>>> s_histories; static owning_lock<std::map<wcstring, history_t *>> s_histories;
void history_save_all() { void history_save_all() {
auto histories = s_histories.acquire(); auto histories = s_histories.acquire();
@ -1492,13 +1492,13 @@ void history_save_all() {
} }
history_t &history_t::history_with_name(const wcstring &name) { history_t &history_t::history_with_name(const wcstring &name) {
// Return a history for the given name, creating it if necessary // Return a history for the given name, creating it if necessary.
// Note that histories are currently never deleted, so we can return a reference to them without // Note that histories are currently never deleted, so we can return a reference to them without
// using something like shared_ptr // using something like shared_ptr.
auto hs = s_histories.acquire(); auto hs = s_histories.acquire();
std::unique_ptr<history_t> &hist = (*hs)[name]; history_t *&hist = (*hs)[name];
if (!hist) { if (!hist) {
hist = make_unique<history_t>(name); hist = new history_t(name);
} }
return *hist; return *hist;
} }