adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.1.1689: profiling code is spread out

Browse Source 
Problem:    Profiling code is spread out.
Solution:   Move more profiling code to profiler.c. (Yegappan Lakshmanan,
            closes #4668)
This commit is contained in:
Bram Moolenaar
2019-07-14 15:48:38 +02:00
parent 1850b14c0d
commit 660a10ad41
8 changed files with 394 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

219
src/ex_cmds2.c
View File

@ -395,140 +395,6 @@ timer_free_all()
# endif # endif
# endif # endif
# if defined(FEAT_PROFILE) || defined(PROTO)
/*
* Start profiling script "fp".
*/
void
script_do_profile(scriptitem_T *si)
{
si->sn_pr_count = 0;
profile_zero(&si->sn_pr_total);
profile_zero(&si->sn_pr_self);
ga_init2(&si->sn_prl_ga, sizeof(sn_prl_T), 100);
si->sn_prl_idx = -1;
si->sn_prof_on = TRUE;
si->sn_pr_nest = 0;
}
/*
* Save time when starting to invoke another script or function.
*/
void
script_prof_save(
proftime_T *tm) /* place to store wait time */
{
scriptitem_T *si;
if (current_sctx.sc_sid > 0 && current_sctx.sc_sid <= script_items.ga_len)
{
si = &SCRIPT_ITEM(current_sctx.sc_sid);
if (si->sn_prof_on && si->sn_pr_nest++ == 0)
profile_start(&si->sn_pr_child);
}
profile_get_wait(tm);
}
/*
* Count time spent in children after invoking another script or function.
*/
void
script_prof_restore(proftime_T *tm)
{
scriptitem_T *si;
if (current_sctx.sc_sid > 0 && current_sctx.sc_sid <= script_items.ga_len)
{
si = &SCRIPT_ITEM(current_sctx.sc_sid);
if (si->sn_prof_on && --si->sn_pr_nest == 0)
{
profile_end(&si->sn_pr_child);
profile_sub_wait(tm, &si->sn_pr_child); /* don't count wait time */
profile_add(&si->sn_pr_children, &si->sn_pr_child);
profile_add(&si->sn_prl_children, &si->sn_pr_child);
}
}
}
/*
* Dump the profiling results for all scripts in file "fd".
*/
void
script_dump_profile(FILE *fd)
{
int id;
scriptitem_T *si;
int i;
FILE *sfd;
sn_prl_T *pp;
for (id = 1; id <= script_items.ga_len; ++id)
{
si = &SCRIPT_ITEM(id);
if (si->sn_prof_on)
{
fprintf(fd, "SCRIPT %s\n", si->sn_name);
if (si->sn_pr_count == 1)
fprintf(fd, "Sourced 1 time\n");
else
fprintf(fd, "Sourced %d times\n", si->sn_pr_count);
fprintf(fd, "Total time: %s\n", profile_msg(&si->sn_pr_total));
fprintf(fd, " Self time: %s\n", profile_msg(&si->sn_pr_self));
fprintf(fd, "\n");
fprintf(fd, "count total (s) self (s)\n");
sfd = mch_fopen((char *)si->sn_name, "r");
if (sfd == NULL)
fprintf(fd, "Cannot open file!\n");
else
{
/* Keep going till the end of file, so that trailing
* continuation lines are listed. */
for (i = 0; ; ++i)
{
if (vim_fgets(IObuff, IOSIZE, sfd))
break;
/* When a line has been truncated, append NL, taking care
* of multi-byte characters . */
if (IObuff[IOSIZE - 2] != NUL && IObuff[IOSIZE - 2] != NL)
{
int n = IOSIZE - 2;
if (enc_utf8)
{
/* Move to the first byte of this char.
* utf_head_off() doesn't work, because it checks
* for a truncated character. */
while (n > 0 && (IObuff[n] & 0xc0) == 0x80)
--n;
}
else if (has_mbyte)
n -= mb_head_off(IObuff, IObuff + n);
IObuff[n] = NL;
IObuff[n + 1] = NUL;
}
if (i < si->sn_prl_ga.ga_len
&& (pp = &PRL_ITEM(si, i))->snp_count > 0)
{
fprintf(fd, "%5d ", pp->snp_count);
if (profile_equal(&pp->sn_prl_total, &pp->sn_prl_self))
fprintf(fd, " ");
else
fprintf(fd, "%s ", profile_msg(&pp->sn_prl_total));
fprintf(fd, "%s ", profile_msg(&pp->sn_prl_self));
}
else
fprintf(fd, " ");
fprintf(fd, "%s", IObuff);
}
fclose(sfd);
}
fprintf(fd, "\n");
}
}
}
# endif
#endif #endif
/* /*
@ -3534,91 +3400,6 @@ get_one_sourceline(struct source_cookie *sp)
return NULL; return NULL;
} }
#if defined(FEAT_PROFILE) || defined(PROTO)
/*
* Called when starting to read a script line.
* "sourcing_lnum" must be correct!
* When skipping lines it may not actually be executed, but we won't find out
* until later and we need to store the time now.
*/
void
script_line_start(void)
{
scriptitem_T *si;
sn_prl_T *pp;
if (current_sctx.sc_sid <= 0 || current_sctx.sc_sid > script_items.ga_len)
return;
si = &SCRIPT_ITEM(current_sctx.sc_sid);
if (si->sn_prof_on && sourcing_lnum >= 1)
{
/* Grow the array before starting the timer, so that the time spent
* here isn't counted. */
(void)ga_grow(&si->sn_prl_ga,
(int)(sourcing_lnum - si->sn_prl_ga.ga_len));
si->sn_prl_idx = sourcing_lnum - 1;
while (si->sn_prl_ga.ga_len <= si->sn_prl_idx
&& si->sn_prl_ga.ga_len < si->sn_prl_ga.ga_maxlen)
{
/* Zero counters for a line that was not used before. */
pp = &PRL_ITEM(si, si->sn_prl_ga.ga_len);
pp->snp_count = 0;
profile_zero(&pp->sn_prl_total);
profile_zero(&pp->sn_prl_self);
++si->sn_prl_ga.ga_len;
}
si->sn_prl_execed = FALSE;
profile_start(&si->sn_prl_start);
profile_zero(&si->sn_prl_children);
profile_get_wait(&si->sn_prl_wait);
}
}
/*
* Called when actually executing a function line.
*/
void
script_line_exec(void)
{
scriptitem_T *si;
if (current_sctx.sc_sid <= 0 || current_sctx.sc_sid > script_items.ga_len)
return;
si = &SCRIPT_ITEM(current_sctx.sc_sid);
if (si->sn_prof_on && si->sn_prl_idx >= 0)
si->sn_prl_execed = TRUE;
}
/*
* Called when done with a script line.
*/
void
script_line_end(void)
{
scriptitem_T *si;
sn_prl_T *pp;
if (current_sctx.sc_sid <= 0 || current_sctx.sc_sid > script_items.ga_len)
return;
si = &SCRIPT_ITEM(current_sctx.sc_sid);
if (si->sn_prof_on && si->sn_prl_idx >= 0
&& si->sn_prl_idx < si->sn_prl_ga.ga_len)
{
if (si->sn_prl_execed)
{
pp = &PRL_ITEM(si, si->sn_prl_idx);
++pp->snp_count;
profile_end(&si->sn_prl_start);
profile_sub_wait(&si->sn_prl_wait, &si->sn_prl_start);
profile_add(&pp->sn_prl_total, &si->sn_prl_start);
profile_self(&pp->sn_prl_self, &si->sn_prl_start,
&si->sn_prl_children);
}
si->sn_prl_idx = -1;
}
}
#endif
/* /*
* ":scriptencoding": Set encoding conversion for a sourced script. * ":scriptencoding": Set encoding conversion for a sourced script.
*/ */

442
src/profiler.c
View File

@ -114,7 +114,7 @@ profile_float(proftime_T *tm)
void void
profile_setlimit(long msec, proftime_T *tm) profile_setlimit(long msec, proftime_T *tm)
{ {
if (msec <= 0) /* no limit */ if (msec <= 0) // no limit
profile_zero(tm); profile_zero(tm);
else else
{ {
@ -144,12 +144,12 @@ profile_passed_limit(proftime_T *tm)
proftime_T now; proftime_T now;
# ifdef MSWIN # ifdef MSWIN
if (tm->QuadPart == 0) /* timer was not set */ if (tm->QuadPart == 0) // timer was not set
return FALSE; return FALSE;
QueryPerformanceCounter(&now); QueryPerformanceCounter(&now);
return (now.QuadPart > tm->QuadPart); return (now.QuadPart > tm->QuadPart);
# else # else
if (tm->tv_sec == 0) /* timer was not set */ if (tm->tv_sec == 0) // timer was not set
return FALSE; return FALSE;
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
return (now.tv_sec > tm->tv_sec return (now.tv_sec > tm->tv_sec
@ -171,7 +171,7 @@ profile_zero(proftime_T *tm)
# endif # endif
} }
# endif /* FEAT_PROFILE || FEAT_RELTIME */ # endif // FEAT_PROFILE || FEAT_RELTIME
#if defined(FEAT_SYN_HL) && defined(FEAT_RELTIME) && defined(FEAT_FLOAT) && defined(FEAT_PROFILE) #if defined(FEAT_SYN_HL) && defined(FEAT_RELTIME) && defined(FEAT_FLOAT) && defined(FEAT_PROFILE)
# if defined(HAVE_MATH_H) # if defined(HAVE_MATH_H)
@ -231,8 +231,8 @@ profile_add(proftime_T *tm, proftime_T *tm2)
void void
profile_self(proftime_T *self, proftime_T *total, proftime_T *children) profile_self(proftime_T *self, proftime_T *total, proftime_T *children)
{ {
/* Check that the result won't be negative. Can happen with recursive // Check that the result won't be negative. Can happen with recursive
* calls. */ // calls.
#ifdef MSWIN #ifdef MSWIN
if (total->QuadPart <= children->QuadPart) if (total->QuadPart <= children->QuadPart)
return; return;
@ -338,16 +338,16 @@ ex_profile(exarg_T *eap)
} }
else else
{ {
/* The rest is similar to ":breakadd". */ // The rest is similar to ":breakadd".
ex_breakadd(eap); ex_breakadd(eap);
} }
} }
/* Command line expansion for :profile. */ // Command line expansion for :profile.
static enum static enum
{ {
PEXP_SUBCMD, /* expand :profile sub-commands */ PEXP_SUBCMD, // expand :profile sub-commands
PEXP_FUNC /* expand :profile func {funcname} */ PEXP_FUNC // expand :profile func {funcname}
} pexpand_what; } pexpand_what;
static char *pexpand_cmds[] = { static char *pexpand_cmds[] = {
@ -376,7 +376,7 @@ get_profile_name(expand_T *xp UNUSED, int idx)
{ {
case PEXP_SUBCMD: case PEXP_SUBCMD:
return (char_u *)pexpand_cmds[idx]; return (char_u *)pexpand_cmds[idx];
/* case PEXP_FUNC: TODO */ // case PEXP_FUNC: TODO
default: default:
return NULL; return NULL;
} }
@ -390,7 +390,7 @@ set_context_in_profile_cmd(expand_T *xp, char_u *arg)
{ {
char_u *end_subcmd; char_u *end_subcmd;
/* Default: expand subcommands. */ // Default: expand subcommands.
xp->xp_context = EXPAND_PROFILE; xp->xp_context = EXPAND_PROFILE;
pexpand_what = PEXP_SUBCMD; pexpand_what = PEXP_SUBCMD;
xp->xp_pattern = arg; xp->xp_pattern = arg;
@ -406,32 +406,10 @@ set_context_in_profile_cmd(expand_T *xp, char_u *arg)
return; return;
} }
/* TODO: expand function names after "func" */ // TODO: expand function names after "func"
xp->xp_context = EXPAND_NOTHING; xp->xp_context = EXPAND_NOTHING;
} }
/*
* Dump the profiling info.
*/
void
profile_dump(void)
{
FILE *fd;
if (profile_fname != NULL)
{
fd = mch_fopen((char *)profile_fname, "w");
if (fd == NULL)
semsg(_(e_notopen), profile_fname);
else
{
script_dump_profile(fd);
func_dump_profile(fd);
fclose(fd);
}
}
}
static proftime_T inchar_time; static proftime_T inchar_time;
/* /*
@ -466,13 +444,40 @@ prof_def_func(void)
return FALSE; return FALSE;
} }
void /*
* Print the count and times for one function or function line.
*/
static void
prof_func_line(
FILE *fd,
int count,
proftime_T *total,
proftime_T *self,
int prefer_self) // when equal print only self time
{
if (count > 0)
{
fprintf(fd, "%5d ", count);
if (prefer_self && profile_equal(total, self))
fprintf(fd, " ");
else
fprintf(fd, "%s ", profile_msg(total));
if (!prefer_self && profile_equal(total, self))
fprintf(fd, " ");
else
fprintf(fd, "%s ", profile_msg(self));
}
else
fprintf(fd, " ");
}
static void
prof_sort_list( prof_sort_list(
FILE *fd, FILE *fd,
ufunc_T **sorttab, ufunc_T **sorttab,
int st_len, int st_len,
char *title, char *title,
int prefer_self) /* when equal print only self time */ int prefer_self) // when equal print only self time
{ {
int i; int i;
ufunc_T *fp; ufunc_T *fp;
@ -492,37 +497,10 @@ prof_sort_list(
fprintf(fd, "\n"); fprintf(fd, "\n");
} }
/*
* Print the count and times for one function or function line.
*/
void
prof_func_line(
FILE *fd,
int count,
proftime_T *total,
proftime_T *self,
int prefer_self) /* when equal print only self time */
{
if (count > 0)
{
fprintf(fd, "%5d ", count);
if (prefer_self && profile_equal(total, self))
fprintf(fd, " ");
else
fprintf(fd, "%s ", profile_msg(total));
if (!prefer_self && profile_equal(total, self))
fprintf(fd, " ");
else
fprintf(fd, "%s ", profile_msg(self));
}
else
fprintf(fd, " ");
}
/* /*
* Compare function for total time sorting. * Compare function for total time sorting.
*/ */
int static int
prof_total_cmp(const void *s1, const void *s2) prof_total_cmp(const void *s1, const void *s2)
{ {
ufunc_T *p1, *p2; ufunc_T *p1, *p2;
@ -535,7 +513,7 @@ prof_total_cmp(const void *s1, const void *s2)
/* /*
* Compare function for self time sorting. * Compare function for self time sorting.
*/ */
int static int
prof_self_cmp(const void *s1, const void *s2) prof_self_cmp(const void *s1, const void *s2)
{ {
ufunc_T *p1, *p2; ufunc_T *p1, *p2;
@ -556,7 +534,7 @@ func_do_profile(ufunc_T *fp)
if (!fp->uf_prof_initialized) if (!fp->uf_prof_initialized)
{ {
if (len == 0) if (len == 0)
len = 1; /* avoid getting error for allocating zero bytes */ len = 1; // avoid getting error for allocating zero bytes
fp->uf_tm_count = 0; fp->uf_tm_count = 0;
profile_zero(&fp->uf_tm_self); profile_zero(&fp->uf_tm_self);
profile_zero(&fp->uf_tm_total); profile_zero(&fp->uf_tm_total);
@ -569,7 +547,7 @@ func_do_profile(ufunc_T *fp)
fp->uf_tml_idx = -1; fp->uf_tml_idx = -1;
if (fp->uf_tml_count == NULL || fp->uf_tml_total == NULL if (fp->uf_tml_count == NULL || fp->uf_tml_total == NULL
|| fp->uf_tml_self == NULL) || fp->uf_tml_self == NULL)
return; /* out of memory */ return; // out of memory
fp->uf_prof_initialized = TRUE; fp->uf_prof_initialized = TRUE;
} }
@ -583,7 +561,7 @@ func_do_profile(ufunc_T *fp)
*/ */
void void
prof_child_enter( prof_child_enter(
proftime_T *tm) /* place to store waittime */ proftime_T *tm) // place to store waittime
{ {
funccall_T *fc = get_current_funccal(); funccall_T *fc = get_current_funccal();
@ -598,14 +576,14 @@ prof_child_enter(
*/ */
void void
prof_child_exit( prof_child_exit(
proftime_T *tm) /* where waittime was stored */ proftime_T *tm) // where waittime was stored
{ {
funccall_T *fc = get_current_funccal(); funccall_T *fc = get_current_funccal();
if (fc != NULL && fc->func->uf_profiling) if (fc != NULL && fc->func->uf_profiling)
{ {
profile_end(&fc->prof_child); profile_end(&fc->prof_child);
profile_sub_wait(tm, &fc->prof_child); /* don't count waiting time */ profile_sub_wait(tm, &fc->prof_child); // don't count waiting time
profile_add(&fc->func->uf_tm_children, &fc->prof_child); profile_add(&fc->func->uf_tm_children, &fc->prof_child);
profile_add(&fc->func->uf_tml_children, &fc->prof_child); profile_add(&fc->func->uf_tml_children, &fc->prof_child);
} }
@ -628,7 +606,7 @@ func_line_start(void *cookie)
&& sourcing_lnum <= fp->uf_lines.ga_len) && sourcing_lnum <= fp->uf_lines.ga_len)
{ {
fp->uf_tml_idx = sourcing_lnum - 1; fp->uf_tml_idx = sourcing_lnum - 1;
/* Skip continuation lines. */ // Skip continuation lines.
while (fp->uf_tml_idx > 0 && FUNCLINE(fp, fp->uf_tml_idx) == NULL) while (fp->uf_tml_idx > 0 && FUNCLINE(fp, fp->uf_tml_idx) == NULL)
--fp->uf_tml_idx; --fp->uf_tml_idx;
fp->uf_tml_execed = FALSE; fp->uf_tml_execed = FALSE;
@ -674,6 +652,324 @@ func_line_end(void *cookie)
fp->uf_tml_idx = -1; fp->uf_tml_idx = -1;
} }
} }
# endif /* FEAT_PROFILE */
/*
* Dump the profiling results for all functions in file "fd".
*/
static void
func_dump_profile(FILE *fd)
{
hashtab_T *functbl;
hashitem_T *hi;
int todo;
ufunc_T *fp;
int i;
ufunc_T **sorttab;
int st_len = 0;
char_u *p;
functbl = func_tbl_get();
todo = (int)functbl->ht_used;
if (todo == 0)
return; // nothing to dump
sorttab = ALLOC_MULT(ufunc_T *, todo);
for (hi = functbl->ht_array; todo > 0; ++hi)
{
if (!HASHITEM_EMPTY(hi))
{
--todo;
fp = HI2UF(hi);
if (fp->uf_prof_initialized)
{
if (sorttab != NULL)
sorttab[st_len++] = fp;
if (fp->uf_name[0] == K_SPECIAL)
fprintf(fd, "FUNCTION <SNR>%s()\n", fp->uf_name + 3);
else
fprintf(fd, "FUNCTION %s()\n", fp->uf_name);
p = home_replace_save(NULL,
get_scriptname(fp->uf_script_ctx.sc_sid));
if (p != NULL)
{
fprintf(fd, " Defined: %s line %ld\n",
p, (long)fp->uf_script_ctx.sc_lnum);
vim_free(p);
}
if (fp->uf_tm_count == 1)
fprintf(fd, "Called 1 time\n");
else
fprintf(fd, "Called %d times\n", fp->uf_tm_count);
fprintf(fd, "Total time: %s\n", profile_msg(&fp->uf_tm_total));
fprintf(fd, " Self time: %s\n", profile_msg(&fp->uf_tm_self));
fprintf(fd, "\n");
fprintf(fd, "count total (s) self (s)\n");
for (i = 0; i < fp->uf_lines.ga_len; ++i)
{
if (FUNCLINE(fp, i) == NULL)
continue;
prof_func_line(fd, fp->uf_tml_count[i],
&fp->uf_tml_total[i], &fp->uf_tml_self[i], TRUE);
fprintf(fd, "%s\n", FUNCLINE(fp, i));
}
fprintf(fd, "\n");
}
}
}
if (sorttab != NULL && st_len > 0)
{
qsort((void *)sorttab, (size_t)st_len, sizeof(ufunc_T *),
prof_total_cmp);
prof_sort_list(fd, sorttab, st_len, "TOTAL", FALSE);
qsort((void *)sorttab, (size_t)st_len, sizeof(ufunc_T *),
prof_self_cmp);
prof_sort_list(fd, sorttab, st_len, "SELF", TRUE);
}
vim_free(sorttab);
}
/*
* Start profiling script "fp".
*/
void
script_do_profile(scriptitem_T *si)
{
si->sn_pr_count = 0;
profile_zero(&si->sn_pr_total);
profile_zero(&si->sn_pr_self);
ga_init2(&si->sn_prl_ga, sizeof(sn_prl_T), 100);
si->sn_prl_idx = -1;
si->sn_prof_on = TRUE;
si->sn_pr_nest = 0;
}
/*
* Save time when starting to invoke another script or function.
*/
void
script_prof_save(
proftime_T *tm) // place to store wait time
{
scriptitem_T *si;
if (current_sctx.sc_sid > 0 && current_sctx.sc_sid <= script_items.ga_len)
{
si = &SCRIPT_ITEM(current_sctx.sc_sid);
if (si->sn_prof_on && si->sn_pr_nest++ == 0)
profile_start(&si->sn_pr_child);
}
profile_get_wait(tm);
}
/*
* Count time spent in children after invoking another script or function.
*/
void
script_prof_restore(proftime_T *tm)
{
scriptitem_T *si;
if (current_sctx.sc_sid > 0 && current_sctx.sc_sid <= script_items.ga_len)
{
si = &SCRIPT_ITEM(current_sctx.sc_sid);
if (si->sn_prof_on && --si->sn_pr_nest == 0)
{
profile_end(&si->sn_pr_child);
profile_sub_wait(tm, &si->sn_pr_child); // don't count wait time
profile_add(&si->sn_pr_children, &si->sn_pr_child);
profile_add(&si->sn_prl_children, &si->sn_pr_child);
}
}
}
/*
* Dump the profiling results for all scripts in file "fd".
*/
static void
script_dump_profile(FILE *fd)
{
int id;
scriptitem_T *si;
int i;
FILE *sfd;
sn_prl_T *pp;
for (id = 1; id <= script_items.ga_len; ++id)
{
si = &SCRIPT_ITEM(id);
if (si->sn_prof_on)
{
fprintf(fd, "SCRIPT %s\n", si->sn_name);
if (si->sn_pr_count == 1)
fprintf(fd, "Sourced 1 time\n");
else
fprintf(fd, "Sourced %d times\n", si->sn_pr_count);
fprintf(fd, "Total time: %s\n", profile_msg(&si->sn_pr_total));
fprintf(fd, " Self time: %s\n", profile_msg(&si->sn_pr_self));
fprintf(fd, "\n");
fprintf(fd, "count total (s) self (s)\n");
sfd = mch_fopen((char *)si->sn_name, "r");
if (sfd == NULL)
fprintf(fd, "Cannot open file!\n");
else
{
// Keep going till the end of file, so that trailing
// continuation lines are listed.
for (i = 0; ; ++i)
{
if (vim_fgets(IObuff, IOSIZE, sfd))
break;
// When a line has been truncated, append NL, taking care
// of multi-byte characters .
if (IObuff[IOSIZE - 2] != NUL && IObuff[IOSIZE - 2] != NL)
{
int n = IOSIZE - 2;
if (enc_utf8)
{
// Move to the first byte of this char.
// utf_head_off() doesn't work, because it checks
// for a truncated character.
while (n > 0 && (IObuff[n] & 0xc0) == 0x80)
--n;
}
else if (has_mbyte)
n -= mb_head_off(IObuff, IObuff + n);
IObuff[n] = NL;
IObuff[n + 1] = NUL;
}
if (i < si->sn_prl_ga.ga_len
&& (pp = &PRL_ITEM(si, i))->snp_count > 0)
{
fprintf(fd, "%5d ", pp->snp_count);
if (profile_equal(&pp->sn_prl_total, &pp->sn_prl_self))
fprintf(fd, " ");
else
fprintf(fd, "%s ", profile_msg(&pp->sn_prl_total));
fprintf(fd, "%s ", profile_msg(&pp->sn_prl_self));
}
else
fprintf(fd, " ");
fprintf(fd, "%s", IObuff);
}
fclose(sfd);
}
fprintf(fd, "\n");
}
}
}
/*
* Dump the profiling info.
*/
void
profile_dump(void)
{
FILE *fd;
if (profile_fname != NULL)
{
fd = mch_fopen((char *)profile_fname, "w");
if (fd == NULL)
semsg(_(e_notopen), profile_fname);
else
{
script_dump_profile(fd);
func_dump_profile(fd);
fclose(fd);
}
}
}
/*
* Called when starting to read a script line.
* "sourcing_lnum" must be correct!
* When skipping lines it may not actually be executed, but we won't find out
* until later and we need to store the time now.
*/
void
script_line_start(void)
{
scriptitem_T *si;
sn_prl_T *pp;
if (current_sctx.sc_sid <= 0 || current_sctx.sc_sid > script_items.ga_len)
return;
si = &SCRIPT_ITEM(current_sctx.sc_sid);
if (si->sn_prof_on && sourcing_lnum >= 1)
{
// Grow the array before starting the timer, so that the time spent
// here isn't counted.
(void)ga_grow(&si->sn_prl_ga,
(int)(sourcing_lnum - si->sn_prl_ga.ga_len));
si->sn_prl_idx = sourcing_lnum - 1;
while (si->sn_prl_ga.ga_len <= si->sn_prl_idx
&& si->sn_prl_ga.ga_len < si->sn_prl_ga.ga_maxlen)
{
// Zero counters for a line that was not used before.
pp = &PRL_ITEM(si, si->sn_prl_ga.ga_len);
pp->snp_count = 0;
profile_zero(&pp->sn_prl_total);
profile_zero(&pp->sn_prl_self);
++si->sn_prl_ga.ga_len;
}
si->sn_prl_execed = FALSE;
profile_start(&si->sn_prl_start);
profile_zero(&si->sn_prl_children);
profile_get_wait(&si->sn_prl_wait);
}
}
/*
* Called when actually executing a function line.
*/
void
script_line_exec(void)
{
scriptitem_T *si;
if (current_sctx.sc_sid <= 0 || current_sctx.sc_sid > script_items.ga_len)
return;
si = &SCRIPT_ITEM(current_sctx.sc_sid);
if (si->sn_prof_on && si->sn_prl_idx >= 0)
si->sn_prl_execed = TRUE;
}
/*
* Called when done with a script line.
*/
void
script_line_end(void)
{
scriptitem_T *si;
sn_prl_T *pp;
if (current_sctx.sc_sid <= 0 || current_sctx.sc_sid > script_items.ga_len)
return;
si = &SCRIPT_ITEM(current_sctx.sc_sid);
if (si->sn_prof_on && si->sn_prl_idx >= 0
&& si->sn_prl_idx < si->sn_prl_ga.ga_len)
{
if (si->sn_prl_execed)
{
pp = &PRL_ITEM(si, si->sn_prl_idx);
++pp->snp_count;
profile_end(&si->sn_prl_start);
profile_sub_wait(&si->sn_prl_wait, &si->sn_prl_start);
profile_add(&pp->sn_prl_total, &si->sn_prl_start);
profile_self(&pp->sn_prl_self, &si->sn_prl_start,
&si->sn_prl_children);
}
si->sn_prl_idx = -1;
}
}
# endif // FEAT_PROFILE
#endif #endif

7
src/proto/ex_cmds2.pro
View File

@ -9,10 +9,6 @@ void add_timer_info(typval_T *rettv, timer_T *timer);
void add_timer_info_all(typval_T *rettv); void add_timer_info_all(typval_T *rettv);
int set_ref_in_timer(int copyID); int set_ref_in_timer(int copyID);
void timer_free_all(void); void timer_free_all(void);
void script_do_profile(scriptitem_T *si);
void script_prof_save(proftime_T *tm);
void script_prof_restore(proftime_T *tm);
void script_dump_profile(FILE *fd);
int autowrite(buf_T *buf, int forceit); int autowrite(buf_T *buf, int forceit);
void autowrite_all(void); void autowrite_all(void);
int check_changed(buf_T *buf, int flags); int check_changed(buf_T *buf, int flags);
@ -63,9 +59,6 @@ char_u *get_scriptname(scid_T id);
void free_scriptnames(void); void free_scriptnames(void);
linenr_T get_sourced_lnum(char_u *(*fgetline)(int, void *, int, int), void *cookie); linenr_T get_sourced_lnum(char_u *(*fgetline)(int, void *, int, int), void *cookie);
char_u *getsourceline(int c, void *cookie, int indent, int do_concat); char_u *getsourceline(int c, void *cookie, int indent, int do_concat);
void script_line_start(void);
void script_line_exec(void);
void script_line_end(void);
void ex_scriptencoding(exarg_T *eap); void ex_scriptencoding(exarg_T *eap);
void ex_scriptversion(exarg_T *eap); void ex_scriptversion(exarg_T *eap);
void ex_finish(exarg_T *eap); void ex_finish(exarg_T *eap);

12
src/proto/profiler.pro
View File

@ -17,18 +17,20 @@ int profile_cmp(const proftime_T *tm1, const proftime_T *tm2);
void ex_profile(exarg_T *eap); void ex_profile(exarg_T *eap);
char_u *get_profile_name(expand_T *xp, int idx); char_u *get_profile_name(expand_T *xp, int idx);
void set_context_in_profile_cmd(expand_T *xp, char_u *arg); void set_context_in_profile_cmd(expand_T *xp, char_u *arg);
void profile_dump(void);
void prof_inchar_enter(void); void prof_inchar_enter(void);
void prof_inchar_exit(void); void prof_inchar_exit(void);
int prof_def_func(void); int prof_def_func(void);
void prof_sort_list(FILE *fd, ufunc_T **sorttab, int st_len, char *title, int prefer_self);
void prof_func_line(FILE *fd, int count, proftime_T *total, proftime_T *self, int prefer_self);
int prof_total_cmp(const void *s1, const void *s2);
int prof_self_cmp(const void *s1, const void *s2);
void func_do_profile(ufunc_T *fp); void func_do_profile(ufunc_T *fp);
void prof_child_enter(proftime_T *tm); void prof_child_enter(proftime_T *tm);
void prof_child_exit(proftime_T *tm); void prof_child_exit(proftime_T *tm);
void func_line_start(void *cookie); void func_line_start(void *cookie);
void func_line_exec(void *cookie); void func_line_exec(void *cookie);
void func_line_end(void *cookie); void func_line_end(void *cookie);
void script_do_profile(scriptitem_T *si);
void script_prof_save(proftime_T *tm);
void script_prof_restore(proftime_T *tm);
void profile_dump(void);
void script_line_start(void);
void script_line_exec(void);
void script_line_end(void);
/* vim: set ft=c : */ /* vim: set ft=c : */

7
src/proto/userfunc.pro
View File

@ -1,12 +1,13 @@
/* userfunc.c */ /* userfunc.c */
void func_init(void); void func_init(void);
hashtab_T *func_tbl_get(void);
int get_lambda_tv(char_u **arg, typval_T *rettv, int evaluate); int get_lambda_tv(char_u **arg, typval_T *rettv, int evaluate);
char_u *deref_func_name(char_u *name, int *lenp, partial_T **partialp, int no_autoload); char_u *deref_func_name(char_u *name, int *lenp, partial_T **partialp, int no_autoload);
int get_func_tv(char_u *name, int len, typval_T *rettv, char_u **arg, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, partial_T *partial, dict_T *selfdict); int get_func_tv(char_u *name, int len, typval_T *rettv, char_u **arg, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, partial_T *partial, dict_T *selfdict);
ufunc_T *find_func(char_u *name); ufunc_T *find_func(char_u *name);
void save_funccal(funccal_entry_T *entry); void save_funccal(funccal_entry_T *entry);
void restore_funccal(void); void restore_funccal(void);
funccall_T * get_current_funccal(void); funccall_T *get_current_funccal(void);
void free_all_functions(void); void free_all_functions(void);
int func_call(char_u *name, typval_T *args, partial_T *partial, dict_T *selfdict, typval_T *rettv); int func_call(char_u *name, typval_T *args, partial_T *partial, dict_T *selfdict, typval_T *rettv);
int call_callback(callback_T *callback, int len, typval_T *rettv, int argcount, typval_T *argvars, int (*argv_func)(int, typval_T *, int), linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict); int call_callback(callback_T *callback, int len, typval_T *rettv, int argcount, typval_T *argvars, int (*argv_func)(int, typval_T *, int), linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict);
@ -17,7 +18,6 @@ int eval_fname_script(char_u *p);
int translated_function_exists(char_u *name); int translated_function_exists(char_u *name);
int function_exists(char_u *name, int no_deref); int function_exists(char_u *name, int no_deref);
char_u *get_expanded_name(char_u *name, int check); char_u *get_expanded_name(char_u *name, int check);
void func_dump_profile(FILE *fd);
char_u *get_user_func_name(expand_T *xp, int idx); char_u *get_user_func_name(expand_T *xp, int idx);
void ex_delfunction(exarg_T *eap); void ex_delfunction(exarg_T *eap);
void func_unref(char_u *name); void func_unref(char_u *name);
@ -30,9 +30,6 @@ int do_return(exarg_T *eap, int reanimate, int is_cmd, void *rettv);
void discard_pending_return(void *rettv); void discard_pending_return(void *rettv);
char_u *get_return_cmd(void *rettv); char_u *get_return_cmd(void *rettv);
char_u *get_func_line(int c, void *cookie, int indent, int do_concat); char_u *get_func_line(int c, void *cookie, int indent, int do_concat);
void func_line_start(void *cookie);
void func_line_exec(void *cookie);
void func_line_end(void *cookie);
int func_has_ended(void *cookie); int func_has_ended(void *cookie);
int func_has_abort(void *cookie); int func_has_abort(void *cookie);
dict_T *make_partial(dict_T *selfdict_in, typval_T *rettv); dict_T *make_partial(dict_T *selfdict_in, typval_T *rettv);

5
src/structs.h
View File

@ -1518,6 +1518,11 @@ struct funccal_entry {
funccal_entry_T *next; funccal_entry_T *next;
}; };
/* From user function to hashitem and back. */
#define UF2HIKEY(fp) ((fp)->uf_name)
#define HIKEY2UF(p) ((ufunc_T *)((p) - offsetof(ufunc_T, uf_name)))
#define HI2UF(hi) HIKEY2UF((hi)->hi_key)
/* Growarray to store info about already sourced scripts. /* Growarray to store info about already sourced scripts.
* For Unix also store the dev/ino, so that we don't have to stat() each * For Unix also store the dev/ino, so that we don't have to stat() each
* script when going through the list. */ * script when going through the list. */

96
src/userfunc.c
View File

@ -23,11 +23,6 @@
#define FC_REMOVED 0x20 // function redefined while uf_refcount > 0 #define FC_REMOVED 0x20 // function redefined while uf_refcount > 0
#define FC_SANDBOX 0x40 // function defined in the sandbox #define FC_SANDBOX 0x40 // function defined in the sandbox
/* From user function to hashitem and back. */
#define UF2HIKEY(fp) ((fp)->uf_name)
#define HIKEY2UF(p) ((ufunc_T *)((p) - offsetof(ufunc_T, uf_name)))
#define HI2UF(hi) HIKEY2UF((hi)->hi_key)
#define FUNCARG(fp, j) ((char_u **)(fp->uf_args.ga_data))[j] #define FUNCARG(fp, j) ((char_u **)(fp->uf_args.ga_data))[j]
/* /*
@ -58,6 +53,15 @@ func_init()
hash_init(&func_hashtab); hash_init(&func_hashtab);
} }
/*
* Return the function hash table
*/
hashtab_T *
func_tbl_get(void)
{
return &func_hashtab;
}
/* /*
* Get function arguments. * Get function arguments.
*/ */
@ -2759,88 +2763,6 @@ get_expanded_name(char_u *name, int check)
} }
#endif #endif
#if defined(FEAT_PROFILE) || defined(PROTO)
/*
* Dump the profiling results for all functions in file "fd".
*/
void
func_dump_profile(FILE *fd)
{
hashitem_T *hi;
int todo;
ufunc_T *fp;
int i;
ufunc_T **sorttab;
int st_len = 0;
char_u *p;
todo = (int)func_hashtab.ht_used;
if (todo == 0)
return; /* nothing to dump */
sorttab = ALLOC_MULT(ufunc_T *, todo);
for (hi = func_hashtab.ht_array; todo > 0; ++hi)
{
if (!HASHITEM_EMPTY(hi))
{
--todo;
fp = HI2UF(hi);
if (fp->uf_prof_initialized)
{
if (sorttab != NULL)
sorttab[st_len++] = fp;
if (fp->uf_name[0] == K_SPECIAL)
fprintf(fd, "FUNCTION <SNR>%s()\n", fp->uf_name + 3);
else
fprintf(fd, "FUNCTION %s()\n", fp->uf_name);
p = home_replace_save(NULL,
get_scriptname(fp->uf_script_ctx.sc_sid));
if (p != NULL)
{
fprintf(fd, " Defined: %s line %ld\n",
p, (long)fp->uf_script_ctx.sc_lnum);
vim_free(p);
}
if (fp->uf_tm_count == 1)
fprintf(fd, "Called 1 time\n");
else
fprintf(fd, "Called %d times\n", fp->uf_tm_count);
fprintf(fd, "Total time: %s\n", profile_msg(&fp->uf_tm_total));
fprintf(fd, " Self time: %s\n", profile_msg(&fp->uf_tm_self));
fprintf(fd, "\n");
fprintf(fd, "count total (s) self (s)\n");
for (i = 0; i < fp->uf_lines.ga_len; ++i)
{
if (FUNCLINE(fp, i) == NULL)
continue;
prof_func_line(fd, fp->uf_tml_count[i],
&fp->uf_tml_total[i], &fp->uf_tml_self[i], TRUE);
fprintf(fd, "%s\n", FUNCLINE(fp, i));
}
fprintf(fd, "\n");
}
}
}
if (sorttab != NULL && st_len > 0)
{
qsort((void *)sorttab, (size_t)st_len, sizeof(ufunc_T *),
prof_total_cmp);
prof_sort_list(fd, sorttab, st_len, "TOTAL", FALSE);
qsort((void *)sorttab, (size_t)st_len, sizeof(ufunc_T *),
prof_self_cmp);
prof_sort_list(fd, sorttab, st_len, "SELF", TRUE);
}
vim_free(sorttab);
}
#endif /* FEAT_PROFILE */
#if defined(FEAT_CMDL_COMPL) || defined(PROTO) #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
/* /*

2
src/version.c
View File

@ -777,6 +777,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 */
/**/
1689,
/**/ /**/
1688, 1688,
/**/ /**/