mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 11:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #10785 from bfredl/tui_start

Browse Source 
TUI: do not use "starting" global mutated by main thread
This commit is contained in:
Justin M. Keyes
2019-08-16 10:23:05 +02:00
committed by GitHub
parent 66528f2475 e79ea696a2
commit 1f5eac1115
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -30,7 +30,7 @@ env:
-DCMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/cmake/i386-linux-gnu.toolchain.cmake" -DCMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/cmake/i386-linux-gnu.toolchain.cmake"
# Environment variables for Clang sanitizers. # Environment variables for Clang sanitizers.
- ASAN_OPTIONS="detect_leaks=1:check_initialization_order=1:log_path=$LOG_DIR/asan" - ASAN_OPTIONS="detect_leaks=1:check_initialization_order=1:log_path=$LOG_DIR/asan"
- TSAN_OPTIONS="log_path=$LOG_DIR/tsan:suppressions=$TRAVIS_BUILD_DIR/src/.tsan-suppressions" - TSAN_OPTIONS="log_path=$LOG_DIR/tsan"
- UBSAN_OPTIONS="print_stacktrace=1 log_path=$LOG_DIR/ubsan" - UBSAN_OPTIONS="print_stacktrace=1 log_path=$LOG_DIR/ubsan"
# Environment variables for Valgrind. # Environment variables for Valgrind.
- VALGRIND_LOG="$LOG_DIR/valgrind-%p.log" - VALGRIND_LOG="$LOG_DIR/valgrind-%p.log"

2
src/.tsan-suppressions
View File

@@ -1,2 +0,0 @@
# Ref: https://github.com/neovim/neovim/pull/10591#issuecomment-521248233
race:starting

2
src/nvim/README.md
View File

@@ -63,7 +63,7 @@ Enable the sanitizer(s) via these environment variables:
export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer
export MSAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer export MSAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer
export TSAN_OPTIONS="log_path=${HOME}/logs/tsan:suppressions=${NVIM_PATH}/src/.tsan-suppressions" export TSAN_OPTIONS="log_path=${HOME}/logs/tsan"
Logs will be written to `${HOME}/logs/*san.PID`. Logs will be written to `${HOME}/logs/*san.PID`.

7
src/nvim/tui/tui.c
View File

@@ -103,6 +103,7 @@ typedef struct {
bool busy, is_invisible; bool busy, is_invisible;
bool cork, overflow; bool cork, overflow;
bool cursor_color_changed; bool cursor_color_changed;
bool is_starting;
cursorentry_T cursor_shapes[SHAPE_IDX_COUNT]; cursorentry_T cursor_shapes[SHAPE_IDX_COUNT];
HlAttrs clear_attrs; HlAttrs clear_attrs;
kvec_t(HlAttrs) attrs; kvec_t(HlAttrs) attrs;
@@ -396,6 +397,7 @@ static void tui_main(UIBridgeData *bridge, UI *ui)
ui->data = data; ui->data = data;
data->bridge = bridge; data->bridge = bridge;
data->loop = &tui_loop; data->loop = &tui_loop;
data->is_starting = true;
kv_init(data->invalid_regions); kv_init(data->invalid_regions);
signal_watcher_init(data->loop, &data->winch_handle, ui); signal_watcher_init(data->loop, &data->winch_handle, ui);
signal_watcher_init(data->loop, &data->cont_handle, data); signal_watcher_init(data->loop, &data->cont_handle, data);
@@ -888,7 +890,7 @@ static void tui_grid_resize(UI *ui, Integer g, Integer width, Integer height)
r->right = MIN(r->right, grid->width); r->right = MIN(r->right, grid->width);
} }
if (!got_winch && (!starting || did_user_set_dimensions)) { if (!got_winch && (!data->is_starting || did_user_set_dimensions)) {
// Resize the _host_ terminal. // Resize the _host_ terminal.
UNIBI_SET_NUM_VAR(data->params[0], (int)height); UNIBI_SET_NUM_VAR(data->params[0], (int)height);
UNIBI_SET_NUM_VAR(data->params[1], (int)width); UNIBI_SET_NUM_VAR(data->params[1], (int)width);
@@ -1051,6 +1053,7 @@ static void tui_mode_change(UI *ui, String mode, Integer mode_idx)
{ {
TUIData *data = ui->data; TUIData *data = ui->data;
tui_set_mode(ui, (ModeShape)mode_idx); tui_set_mode(ui, (ModeShape)mode_idx);
data->is_starting = false; // mode entered, no longer starting
data->showing_mode = (ModeShape)mode_idx; data->showing_mode = (ModeShape)mode_idx;
} }
@@ -1355,7 +1358,7 @@ static void tui_guess_size(UI *ui)
int width = 0, height = 0; int width = 0, height = 0;
// 1 - look for non-default 'columns' and 'lines' options during startup // 1 - look for non-default 'columns' and 'lines' options during startup
if (starting && (Columns != DFLT_COLS || Rows != DFLT_ROWS)) { if (data->is_starting && (Columns != DFLT_COLS || Rows != DFLT_ROWS)) {
did_user_set_dimensions = true; did_user_set_dimensions = true;
assert(Columns >= INT_MIN && Columns <= INT_MAX); assert(Columns >= INT_MIN && Columns <= INT_MAX);
assert(Rows >= INT_MIN && Rows <= INT_MAX); assert(Rows >= INT_MIN && Rows <= INT_MAX);