mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-08-26 17:11:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(tui): ui may attempt reattach during shutdown #41368

Browse Source 
Problem:
TSan CI, always at exit:

    WARNING: ThreadSanitizer: use of an invalid mutex (e.g. uninitialized or destroyed)
        #1 uv_mutex_lock
        #2 tui_flush src/nvim/tui/tui.c:1708
        #3 ui_client_event_flush
        #4 parse_msgpack src/nvim/msgpack_rpc/channel.c:259
        ...
        #10 event_teardown src/nvim/main.c:187
        #11 os_exit src/nvim/main.c:720
        ...
        #19 tinput_done_event src/nvim/tui/input.c:184

Analysis (guess):
`rpc_close_event()` may run during `event_teardown()` and reattach to
a restarted server, then `ui_client_attached=true` gets set and redraws
resume in an already-stopped TUI.

Solution:
Check `!exiting` in `rpc_close_event`, like we already do in
`channel_proc_exit_cb()`.
This commit is contained in:
Justin M. Keyes
2026-08-18 11:38:52 -04:00
committed by GitHub
parent 0c091cedc2
commit f238788601
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/msgpack_rpc/channel.c
View File

@@ -512,7 +512,7 @@ static void rpc_close_event(void **argv)
bool is_ui_client = ui_client_channel_id && channel->id == ui_client_channel_id; bool is_ui_client = ui_client_channel_id && channel->id == ui_client_channel_id;
if (is_ui_client) { if (is_ui_client) {
if (channel->streamtype != kChannelStreamProc) { if (!exiting && channel->streamtype != kChannelStreamProc) {
ui_client_attach_to_restarted_server(false); ui_client_attach_to_restarted_server(false);
} }
if (ui_client_channel_id != channel->id) { if (ui_client_channel_id != channel->id) {