Mercurial > vim
changeset 7979:22367b9f528a v7.4.1285
commit https://github.com/vim/vim/commit/79c2c881bb7ae1cbdeeff91d4875b4bf2e54df06
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 7 21:19:28 2016 +0100
patch 7.4.1285
Problem: Cannot measure elapsed time.
Solution: Add reltimefloat().
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 07 Feb 2016 21:30:04 +0100 |
| parents | 30ff820a55d2 |
| children | 6ac39ddc237c |
| files | src/eval.c src/ex_cmds2.c src/proto/ex_cmds2.pro src/testdir/test_alot.vim src/version.c |
| diffstat | 5 files changed, 46 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -690,6 +690,9 @@ static void f_pyeval(typval_T *argvars, static void f_range(typval_T *argvars, typval_T *rettv); static void f_readfile(typval_T *argvars, typval_T *rettv); static void f_reltime(typval_T *argvars, typval_T *rettv); +#ifdef FEAT_FLOAT +static void f_reltimefloat(typval_T *argvars, typval_T *rettv); +#endif static void f_reltimestr(typval_T *argvars, typval_T *rettv); static void f_remote_expr(typval_T *argvars, typval_T *rettv); static void f_remote_foreground(typval_T *argvars, typval_T *rettv); @@ -8270,6 +8273,7 @@ static struct fst {"range", 1, 3, f_range}, {"readfile", 1, 3, f_readfile}, {"reltime", 0, 2, f_reltime}, + {"reltimefloat", 1, 1, f_reltimefloat}, {"reltimestr", 1, 1, f_reltimestr}, {"remote_expr", 2, 3, f_remote_expr}, {"remote_foreground", 1, 1, f_remote_foreground}, @@ -16010,6 +16014,26 @@ f_reltime(typval_T *argvars UNUSED, typv #endif } +#ifdef FEAT_FLOAT +/* + * "reltimefloat()" function + */ + static void +f_reltimefloat(typval_T *argvars UNUSED, typval_T *rettv) +{ +# ifdef FEAT_RELTIME + proftime_T tm; +# endif + + rettv->v_type = VAR_FLOAT; + rettv->vval.v_float = 0; +# ifdef FEAT_RELTIME + if (list2proftime(&argvars[0], &tm) == OK) + rettv->vval.v_float = profile_float(&tm); +# endif +} +#endif + /* * "reltimestr()" function */
--- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -1010,6 +1010,24 @@ profile_msg(proftime_T *tm) return buf; } +# if defined(FEAT_FLOAT) || defined(PROTO) +/* + * Return a float that represents the time in "tm". + */ + float_T +profile_float(proftime_T *tm) +{ +# ifdef WIN3264 + LARGE_INTEGER fr; + + QueryPerformanceFrequency(&fr); + return (float_T)tm->QuadPart / (float_T)fr.QuadPart; +# else + return (float_T)tm->tv_sec + (float_T)tm->tv_usec / 1000000.0; +# endif +} +# endif + /* * Put the time "msec" past now in "tm". */
--- a/src/proto/ex_cmds2.pro +++ b/src/proto/ex_cmds2.pro @@ -14,6 +14,7 @@ void profile_start(proftime_T *tm); void profile_end(proftime_T *tm); void profile_sub(proftime_T *tm, proftime_T *tm2); char *profile_msg(proftime_T *tm); +float_T profile_float(proftime_T *tm); void profile_setlimit(long msec, proftime_T *tm); int profile_passed_limit(proftime_T *tm); void profile_zero(proftime_T *tm);