patch 9.0.1464: strace filetype detection is expensive
Problem: Strace filetype detection is expensive.
Solution: Match with a cheap pattern first. (Federico Mengozzi,
closes #12220)
This commit is contained in:
committed by
Bram Moolenaar
parent
4c42c7eef4
commit
6e5a9f9482
4
runtime/autoload/dist/script.vim
vendored
4
runtime/autoload/dist/script.vim
vendored
@ -338,7 +338,9 @@ def DetectFromText(line1: string)
|
|||||||
set ft=virata
|
set ft=virata
|
||||||
|
|
||||||
# Strace
|
# Strace
|
||||||
elseif line1 =~ '[0-9:.]* *execve(' || line1 =~ '^__libc_start_main'
|
# inaccurate fast match first, then use accurate slow match
|
||||||
|
elseif (line1 =~ 'execve(' && line1 =~ '^[0-9:.]* *execve(')
|
||||||
|
|| line1 =~ '^__libc_start_main'
|
||||||
set ft=strace
|
set ft=strace
|
||||||
|
|
||||||
# VSE JCL
|
# VSE JCL
|
||||||
|
|||||||
@ -733,6 +733,11 @@ func Test_filetype_detection()
|
|||||||
filetype off
|
filetype off
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
" Content lines that should not result in filetype detection
|
||||||
|
let s:false_positive_checks = {
|
||||||
|
\ '': [['test execve("/usr/bin/pstree", ["pstree"], 0x7ff0 /* 63 vars */) = 0']],
|
||||||
|
\ }
|
||||||
|
|
||||||
" Filetypes detected from the file contents by scripts.vim
|
" Filetypes detected from the file contents by scripts.vim
|
||||||
let s:script_checks = {
|
let s:script_checks = {
|
||||||
\ 'virata': [['% Virata'],
|
\ 'virata': [['% Virata'],
|
||||||
@ -824,6 +829,7 @@ func Run_script_detection(test_dict)
|
|||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
func Test_script_detection()
|
func Test_script_detection()
|
||||||
|
call Run_script_detection(s:false_positive_checks)
|
||||||
call Run_script_detection(s:script_checks)
|
call Run_script_detection(s:script_checks)
|
||||||
call Run_script_detection(s:script_env_checks)
|
call Run_script_detection(s:script_env_checks)
|
||||||
endfunc
|
endfunc
|
||||||
|
|||||||
@ -695,6 +695,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1464,
|
||||||
/**/
|
/**/
|
||||||
1463,
|
1463,
|
||||||
/**/
|
/**/
|
||||||
|
|||||||
Reference in New Issue
Block a user