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

Make the kill ring thread-safe

Browse source 
Now that the kill ring may be accessed on a background thread, ensure it
is thread safe.
This commit is contained in:
ridiculousfish 2021-04-21 17:37:44 -07:00
parent 9d66ddc840
commit 42d674819f
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/kill.cpp
View file

@ -17,45 +17,45 @@
#include "fallback.h" // IWYU pragma: keep #include "fallback.h" // IWYU pragma: keep
/** Kill ring */ /** Kill ring */
using kill_list_t = std::list<wcstring>; static owning_lock<std::list<wcstring>> s_kill_list;
static kill_list_t kill_list;
void kill_add(wcstring str) { void kill_add(wcstring str) {
ASSERT_IS_MAIN_THREAD();
if (!str.empty()) { if (!str.empty()) {
kill_list.push_front(std::move(str)); s_kill_list.acquire()->push_front(std::move(str));
} }
} }
/// Remove first match for specified string from circular list.
static void kill_remove(const wcstring &s) {
ASSERT_IS_MAIN_THREAD();
auto iter = std::find(kill_list.begin(), kill_list.end(), s);
if (iter != kill_list.end()) kill_list.erase(iter);
}
void kill_replace(const wcstring &old, const wcstring &newv) { void kill_replace(const wcstring &old, const wcstring &newv) {
kill_remove(old); auto kill_list = s_kill_list.acquire();
kill_add(newv); // Remove old.
auto iter = std::find(kill_list->begin(), kill_list->end(), old);
if (iter != kill_list->end()) kill_list->erase(iter);
// Add new.
if (!newv.empty()) {
kill_list->push_front(newv);
}
} }
wcstring kill_yank_rotate() { wcstring kill_yank_rotate() {
ASSERT_IS_MAIN_THREAD(); auto kill_list = s_kill_list.acquire();
// Move the first element to the end. // Move the first element to the end.
if (kill_list.empty()) { if (kill_list->empty()) {
return {}; return {};
} }
kill_list.splice(kill_list.end(), kill_list, kill_list.begin()); kill_list->splice(kill_list->end(), *kill_list, kill_list->begin());
return kill_list.front(); return kill_list->front();
} }
wcstring kill_yank() { wcstring kill_yank() {
if (kill_list.empty()) { auto kill_list = s_kill_list.acquire();
if (kill_list->empty()) {
return {}; return {};
} }
return kill_list.front(); return kill_list->front();
} }
wcstring_list_t kill_entries() { wcstring_list_t kill_entries() {
return {kill_list.begin(), kill_list.end()}; auto kill_list = s_kill_list.acquire();
return wcstring_list_t{kill_list->begin(), kill_list->end()};
} }