diff options
author | bfredl <bjorn.linse@gmail.com> | 2023-04-23 19:02:23 +0200 |
---|---|---|
committer | bfredl <bjorn.linse@gmail.com> | 2023-04-24 17:38:19 +0200 |
commit | 0d2fe7786537ef63d0d3ed1e94546eb3ee35a368 (patch) | |
tree | f479da09da4436af82dc015646ab519556c81750 /src/nvim/ui.c | |
parent | 3ac952d4e27f4e2454332a730310316fe13fd4a3 (diff) | |
download | rneovim-0d2fe7786537ef63d0d3ed1e94546eb3ee35a368.tar.gz rneovim-0d2fe7786537ef63d0d3ed1e94546eb3ee35a368.tar.bz2 rneovim-0d2fe7786537ef63d0d3ed1e94546eb3ee35a368.zip |
refactor(time): refactor delay with input checking
Previously, there were three low-level delay entry points
- os_delay(ms, ignoreinput=true): sleep for ms, only break on got_int
- os_delay(ms, ignoreinput=false): sleep for ms, break on any key input
os_microdelay(us, false): equivalent, but in μs (not directly called)
- os_microdelay(us, true): sleep for μs, never break.
The implementation of the latter two both used uv_cond_timedwait()
This could have been for two reasons:
1. allow another thread to "interrupt" the wait
2. uv_cond_timedwait() has higher resolution than uv_sleep()
However we (1) never used the first, even when TUI was a thread, and
(2) nowhere in the codebase are we using μs resolution, it is always a ms
multiplied with 1000.
In addition, os_delay(ms, false) would completely block the thread for
100ms intervals and in between check for input. This is not how event handling
is done alound here.
Therefore:
Replace the implementation of os_delay(ms, false) to use
LOOP_PROCESS_EVENTS_UNTIL which does a proper epoll wait with a timeout,
instead of the 100ms timer panic.
Replace os_microdelay(us, false) with a direct wrapper of uv_sleep.
Diffstat (limited to 'src/nvim/ui.c')
-rw-r--r-- | src/nvim/ui.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/ui.c b/src/nvim/ui.c index 45959b7b67..6d09b9f3a3 100644 --- a/src/nvim/ui.c +++ b/src/nvim/ui.c @@ -439,7 +439,7 @@ void ui_line(ScreenGrid *grid, int row, int startcol, int endcol, int clearcol, MIN(clearcol, (int)grid->cols - 1)); ui_call_flush(); uint64_t wd = (uint64_t)labs(p_wd); - os_microdelay(wd * 1000U, true); + os_sleep(wd); pending_cursor_update = true; // restore the cursor later } } @@ -521,7 +521,7 @@ void ui_flush(void) ui_call_flush(); if (p_wd && (rdb_flags & RDB_FLUSH)) { - os_microdelay((uint64_t)labs(p_wd) * 1000U, true); + os_sleep((uint64_t)labs(p_wd)); } } |