aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.5028: syntax regexp matching can be slow

Browse Source 
Problem:    Syntax regexp matching can be slow.
Solution:   Adjust the counters for checking the timeout to check about once
            per msec. (closes #10487, closes #2712)
This commit is contained in:
Bram Moolenaar
2022-05-27 15:35:28 +01:00
parent bf79a4e48d
commit 02e8d4e4ff
3 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/regexp_nfa.c
View File

@@ -5649,11 +5649,27 @@ find_match_text(colnr_T startcol, int regstart, char_u *match_text)
static int
nfa_did_time_out()
{
if (nfa_time_limit != NULL && profile_passed_limit(nfa_time_limit))
static int tm_count = 0;
// Check for timeout once in 800 times to avoid excessive overhead from
// reading the clock. The value has been picked to check about once per
// msec on a modern CPU.
if (nfa_time_limit != NULL)
{
if (nfa_timed_out != NULL)
*nfa_timed_out = TRUE;
return TRUE;
if (tm_count == 800)
{
if (profile_passed_limit(nfa_time_limit))
{
if (nfa_timed_out != NULL)
*nfa_timed_out = TRUE;
return TRUE;
}
// Only reset the count when not timed out, so that when it did
// timeout it keeps timing out until the time limit is changed.
tm_count = 0;
}
else
++tm_count;
}
return FALSE;
}