Mercurial > vim
changeset 14226:706b57cd1b00 v8.1.0130
patch 8.1.0130: ":profdel func" does not work if func was called already
commit https://github.com/vim/vim/commit/ad6480961080f80a455b2394f27b02935a2ded52
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jun 30 18:28:03 2018 +0200
patch 8.1.0130: ":profdel func" does not work if func was called already
Problem: ":profdel func" does not work if func was called already.
(Dominique Pelle)
Solution: Reset uf_profiling and add a flag to indicate initialization was
done.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 30 Jun 2018 18:30:06 +0200 |
| parents | dd5c970831d4 |
| children | 38967af4302a |
| files | src/structs.h src/userfunc.c src/version.c |
| diffstat | 3 files changed, 33 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/src/structs.h +++ b/src/structs.h @@ -1345,6 +1345,7 @@ typedef struct garray_T uf_lines; /* function lines */ #ifdef FEAT_PROFILE int uf_profiling; /* TRUE when func is being profiled */ + int uf_prof_initialized; /* profiling the function as a whole */ int uf_tm_count; /* nr of calls */ proftime_T uf_tm_total; /* time spent in function + children */
--- a/src/userfunc.c +++ b/src/userfunc.c @@ -293,10 +293,6 @@ get_lambda_tv(char_u **arg, typval_T *re fp->uf_scoped = NULL; #ifdef FEAT_PROFILE - fp->uf_tml_count = NULL; - fp->uf_tml_total = NULL; - fp->uf_tml_self = NULL; - fp->uf_profiling = FALSE; if (prof_def_func()) func_do_profile(fp); #endif @@ -706,6 +702,7 @@ call_user_func( #ifdef FEAT_PROFILE proftime_T wait_start; proftime_T call_start; + int started_profiling = FALSE; #endif /* If depth of calling is getting too high, don't execute the function */ @@ -921,7 +918,10 @@ call_user_func( if (do_profiling == PROF_YES) { if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL)) + { + started_profiling = TRUE; func_do_profile(fp); + } if (fp->uf_profiling || (fc->caller != NULL && fc->caller->func->uf_profiling)) { @@ -965,6 +965,9 @@ call_user_func( profile_add(&fc->caller->func->uf_tm_children, &call_start); profile_add(&fc->caller->func->uf_tml_children, &call_start); } + if (started_profiling) + // make a ":profdel func" stop profiling the function + fp->uf_profiling = FALSE; } #endif @@ -2522,23 +2525,28 @@ func_do_profile(ufunc_T *fp) { int len = fp->uf_lines.ga_len; - if (len == 0) - len = 1; /* avoid getting error for allocating zero bytes */ - fp->uf_tm_count = 0; - profile_zero(&fp->uf_tm_self); - profile_zero(&fp->uf_tm_total); - if (fp->uf_tml_count == NULL) - fp->uf_tml_count = (int *)alloc_clear((unsigned) (sizeof(int) * len)); - if (fp->uf_tml_total == NULL) - fp->uf_tml_total = (proftime_T *)alloc_clear((unsigned) - (sizeof(proftime_T) * len)); - if (fp->uf_tml_self == NULL) - fp->uf_tml_self = (proftime_T *)alloc_clear((unsigned) - (sizeof(proftime_T) * len)); - fp->uf_tml_idx = -1; - if (fp->uf_tml_count == NULL || fp->uf_tml_total == NULL - || fp->uf_tml_self == NULL) - return; /* out of memory */ + if (!fp->uf_prof_initialized) + { + if (len == 0) + len = 1; /* avoid getting error for allocating zero bytes */ + fp->uf_tm_count = 0; + profile_zero(&fp->uf_tm_self); + profile_zero(&fp->uf_tm_total); + if (fp->uf_tml_count == NULL) + fp->uf_tml_count = (int *)alloc_clear( + (unsigned)(sizeof(int) * len)); + if (fp->uf_tml_total == NULL) + fp->uf_tml_total = (proftime_T *)alloc_clear( + (unsigned)(sizeof(proftime_T) * len)); + if (fp->uf_tml_self == NULL) + fp->uf_tml_self = (proftime_T *)alloc_clear( + (unsigned)(sizeof(proftime_T) * len)); + fp->uf_tml_idx = -1; + if (fp->uf_tml_count == NULL || fp->uf_tml_total == NULL + || fp->uf_tml_self == NULL) + return; /* out of memory */ + fp->uf_prof_initialized = TRUE; + } fp->uf_profiling = TRUE; } @@ -2568,7 +2576,7 @@ func_dump_profile(FILE *fd) { --todo; fp = HI2UF(hi); - if (fp->uf_profiling) + if (fp->uf_prof_initialized) { if (sorttab != NULL) sorttab[st_len++] = fp;