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

Rename input_initialized to s_input_initialized and make it relaxed atomic

Browse source
This commit is contained in:
ridiculousfish 2019-05-04 17:18:27 -07:00
parent e10838d5d6
commit 9018a7d5ee
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/input.cpp
View file

@ -267,14 +267,14 @@ static maybe_t<char_event_t> interrupt_handler() {
return char_event_t{char_event_type_t::check_exit}; return char_event_t{char_event_type_t::check_exit};
} }
static std::atomic<bool> input_initialized{false}; 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 /// Set up arrays used by readch to detect escape sequences for special keys and perform related
/// initializations for our input subsystem. /// initializations for our input subsystem.
void init_input() { void init_input() {
ASSERT_IS_MAIN_THREAD(); ASSERT_IS_MAIN_THREAD();
if (input_initialized.load(std::memory_order_relaxed)) return; if (s_input_initialized) return;
input_initialized.store(true, std::memory_order_relaxed); s_input_initialized = true;
input_common_init(&interrupt_handler); input_common_init(&interrupt_handler);
s_terminfo_mappings = create_input_terminfo(); s_terminfo_mappings = create_input_terminfo();
@ -730,7 +730,7 @@ static std::vector<terminfo_mapping_t> create_input_terminfo() {
bool input_terminfo_get_sequence(const wchar_t *name, wcstring *out_seq) { bool input_terminfo_get_sequence(const wchar_t *name, wcstring *out_seq) {
ASSERT_IS_MAIN_THREAD(); ASSERT_IS_MAIN_THREAD();
assert(input_initialized); assert(s_input_initialized);
CHECK(name, 0); CHECK(name, 0);
const char *res = 0; const char *res = 0;
@ -754,7 +754,7 @@ bool input_terminfo_get_sequence(const wchar_t *name, wcstring *out_seq) {
} }
bool input_terminfo_get_name(const wcstring &seq, wcstring *out_name) { bool input_terminfo_get_name(const wcstring &seq, wcstring *out_name) {
assert(input_initialized); assert(s_input_initialized);
for (const terminfo_mapping_t &m : *s_terminfo_mappings) { for (const terminfo_mapping_t &m : *s_terminfo_mappings) {
if (!m.seq) { if (!m.seq) {
@ -772,7 +772,7 @@ bool input_terminfo_get_name(const wcstring &seq, wcstring *out_name) {
} }
wcstring_list_t input_terminfo_get_names(bool skip_null) { wcstring_list_t input_terminfo_get_names(bool skip_null) {
assert(input_initialized); assert(s_input_initialized);
wcstring_list_t result; wcstring_list_t result;
const auto &mappings = *s_terminfo_mappings; const auto &mappings = *s_terminfo_mappings;
result.reserve(mappings.size()); result.reserve(mappings.size());