Mercurial > vim
diff src/evalfunc.c @ 29071:b90bca860b5a v8.2.5057
patch 8.2.5057: using gettimeofday() for timeout is very inefficient
Commit: https://github.com/vim/vim/commit/6574577cacd393ab7591fc776ea060eebc939e55
Author: Paul Ollis <paul@cleversheep.org>
Date: Sun Jun 5 16:55:54 2022 +0100
patch 8.2.5057: using gettimeofday() for timeout is very inefficient
Problem: Using gettimeofday() for timeout is very inefficient.
Solution: Set a platform dependent timer. (Paul Ollis, closes https://github.com/vim/vim/issues/10505)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 05 Jun 2022 18:00:08 +0200 |
| parents | 9f25e0ed831d |
| children | 175eacde28b8 |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -8439,7 +8439,6 @@ search_cmn(typval_T *argvars, pos_T *mat int retval = 0; // default: FAIL long lnum_stop = 0; #ifdef FEAT_RELTIME - proftime_T tm; long time_limit = 0; #endif int options = SEARCH_KEEP; @@ -8486,11 +8485,6 @@ search_cmn(typval_T *argvars, pos_T *mat } } -#ifdef FEAT_RELTIME - // Set the time limit, if there is one. - profile_setlimit(time_limit, &tm); -#endif - /* * This function does not accept SP_REPEAT and SP_RETCOUNT flags. * Check to make sure only those flags are set. @@ -8509,7 +8503,7 @@ search_cmn(typval_T *argvars, pos_T *mat CLEAR_FIELD(sia); sia.sa_stop_lnum = (linenr_T)lnum_stop; #ifdef FEAT_RELTIME - sia.sa_tm = &tm; + sia.sa_tm = time_limit; #endif // Repeat until {skip} returns FALSE. @@ -8955,19 +8949,11 @@ do_searchpair( int use_skip = FALSE; int err; int options = SEARCH_KEEP; -#ifdef FEAT_RELTIME - proftime_T tm; -#endif // Make 'cpoptions' empty, the 'l' flag should not be used here. save_cpo = p_cpo; p_cpo = empty_option; -#ifdef FEAT_RELTIME - // Set the time limit, if there is one. - profile_setlimit(time_limit, &tm); -#endif - // Make two search patterns: start/end (pat2, for in nested pairs) and // start/middle/end (pat3, for the top pair). pat2 = alloc(STRLEN(spat) + STRLEN(epat) + 17); @@ -8998,7 +8984,7 @@ do_searchpair( CLEAR_FIELD(sia); sia.sa_stop_lnum = lnum_stop; #ifdef FEAT_RELTIME - sia.sa_tm = &tm; + sia.sa_tm = time_limit; #endif n = searchit(curwin, curbuf, &pos, NULL, dir, pat, 1L, options, RE_SEARCH, &sia);