thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.5115: search timeout is overrun with some patterns

Browse Source 
Problem:    Search timeout is overrun with some patterns.
Solution:   Check for timeout in more places.  Make the flag volatile and
            atomic.  Use assert_inrange() to see what happened.
This commit is contained in:
Bram Moolenaar
2022-06-17 15:17:10 +01:00
parent 5ea38d1e7f
commit 616592e081
7 changed files with 80 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/testdir/test_search.vim
View File

@@ -1576,10 +1576,17 @@ endfunc
func Test_search_timeout()
new
" use a complicated pattern that should be slow with the BT engine
let pattern = '\%#=1a*.*X\@<=b*'
let search_timeout = 0.02
" use a timeout of 50 msec
let search_timeout = 0.05
" fill the buffer so that it takes 15 times the timeout to search
let slow_target_timeout = search_timeout * 15.0
" Fill the buffer with more and more text until searching takes more time
" than slow_target_timeout.
for n in range(40, 400, 30)
call setline(1, ['aaa', repeat('abc ', n), 'ccc'])
let start = reltime()
@@ -1591,11 +1598,14 @@ func Test_search_timeout()
endfor
call assert_true(elapsed > slow_target_timeout)
" Check that the timeout kicks in, the time should be less than half of what
" we measured without the timeout. This is permissive, because the timer is
" known to overrun, especially when using valgrind.
let max_time = elapsed / 2.0
let start = reltime()
call search(pattern, '', 0, float2nr(search_timeout * 1000))
let elapsed = reltimefloat(reltime(start))
call assert_true(elapsed < max_time)
call assert_inrange(search_timeout * 0.9, max_time, elapsed)
bwipe!
endfunc