diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-11-01 17:34:40 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-11-01 17:34:40 +0000 |
| commit | e9da72e4827730f7bfb650d80384339cd62fb2a6 (patch) | |
| tree | 65fdff50960e890a9a434f525c4f457d393a8312 | |
| parent | 5a6404cff47a7d35da10ada4d57ec9eb15c1dfab (diff) | |
| download | vim-git-e9da72e4827730f7bfb650d80384339cd62fb2a6.tar.gz | |
updated for version 7.0-157v7.0.157
| -rw-r--r-- | src/eval.c | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/eval.c b/src/eval.c index 5ff523e54..f0d38df5a 100644 --- a/src/eval.c +++ b/src/eval.c @@ -166,7 +166,6 @@ struct ufunc int uf_tm_count; /* nr of calls */ proftime_T uf_tm_total; /* time spend in function + children */ proftime_T uf_tm_self; /* time spend in function itself */ - proftime_T uf_tm_start; /* time at function call */ proftime_T uf_tm_children; /* time spent in children this call */ /* profiling the function per line */ int *uf_tml_count; /* nr of times line was executed */ @@ -19764,6 +19763,7 @@ call_user_func(fp, argcount, argvars, rettv, firstline, lastline, selfdict) char_u *name; #ifdef FEAT_PROFILE proftime_T wait_start; + proftime_T call_start; #endif /* If depth of calling is getting too high, don't execute the function */ @@ -19943,7 +19943,7 @@ call_user_func(fp, argcount, argvars, rettv, firstline, lastline, selfdict) || (fc.caller != NULL && &fc.caller->func->uf_profiling)) { ++fp->uf_tm_count; - profile_start(&fp->uf_tm_start); + profile_start(&call_start); profile_zero(&fp->uf_tm_children); } script_prof_save(&wait_start); @@ -19973,14 +19973,14 @@ call_user_func(fp, argcount, argvars, rettv, firstline, lastline, selfdict) if (do_profiling == PROF_YES && (fp->uf_profiling || (fc.caller != NULL && &fc.caller->func->uf_profiling))) { - profile_end(&fp->uf_tm_start); - profile_sub_wait(&wait_start, &fp->uf_tm_start); - profile_add(&fp->uf_tm_total, &fp->uf_tm_start); - profile_self(&fp->uf_tm_self, &fp->uf_tm_start, &fp->uf_tm_children); + profile_end(&call_start); + profile_sub_wait(&wait_start, &call_start); + profile_add(&fp->uf_tm_total, &call_start); + profile_self(&fp->uf_tm_self, &call_start, &fp->uf_tm_children); if (fc.caller != NULL && &fc.caller->func->uf_profiling) { - profile_add(&fc.caller->func->uf_tm_children, &fp->uf_tm_start); - profile_add(&fc.caller->func->uf_tml_children, &fp->uf_tm_start); + profile_add(&fc.caller->func->uf_tm_children, &call_start); + profile_add(&fc.caller->func->uf_tml_children, &call_start); } } #endif diff --git a/src/version.c b/src/version.c index b59fa77b4..82d0b88af 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 157, +/**/ 156, /**/ 155, |