h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-29 06:01:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

Replace a bunch of ASSERT_IS_MAIN_THREAD

Browse Source 
Switch these to a new function parser.assert_can_execute(), in
preparation for allowing execution off of the main thread.
This commit is contained in:
ridiculousfish
2022-06-19 16:27:06 -07:00
parent e2e340823a
commit 50f6b06251
13 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/input.cpp
View File

@@ -275,15 +275,12 @@ void input_mapping_set_t::add(wcstring sequence, const wchar_t *command, const w
input_mapping_set_t::add(std::move(sequence), &command, 1, mode, sets_mode, user);
}
static relaxed_atomic_bool_t s_input_initialized{false};
/// Set up arrays used by readch to detect escape sequences for special keys and perform related
/// initializations for our input subsystem.
void init_input() {
ASSERT_IS_MAIN_THREAD();
if (s_input_initialized) return;
s_input_initialized = true;
if (s_terminfo_mappings.is_set()) return;
s_terminfo_mappings = create_input_terminfo();
auto input_mapping = input_mappings();
@@ -905,7 +902,7 @@ static std::vector<terminfo_mapping_t> create_input_terminfo() {
}
bool input_terminfo_get_sequence(const wcstring &name, wcstring *out_seq) {
assert(s_input_initialized);
assert(s_terminfo_mappings.is_set());
for (const terminfo_mapping_t &m : *s_terminfo_mappings) {
if (name == m.name) {
// Found the mapping.
@@ -923,8 +920,7 @@ bool input_terminfo_get_sequence(const wcstring &name, wcstring *out_seq) {
}
bool input_terminfo_get_name(const wcstring &seq, wcstring *out_name) {
assert(s_input_initialized);
assert(s_terminfo_mappings.is_set());
for (const terminfo_mapping_t &m : *s_terminfo_mappings) {
if (m.seq && seq == str2wcstring(*m.seq)) {
out_name->assign(m.name);
@@ -936,8 +932,7 @@ bool input_terminfo_get_name(const wcstring &seq, wcstring *out_name) {
}
wcstring_list_t input_terminfo_get_names(bool skip_null) {
assert(s_input_initialized);
assert(s_terminfo_mappings.is_set());
wcstring_list_t result;
const auto &mappings = *s_terminfo_mappings;
result.reserve(mappings.size());