From 660a10ad41c14363326f83451c3c425201923119 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 14 Jul 2019 15:48:38 +0200 Subject: patch 8.1.1689: profiling code is spread out Problem: Profiling code is spread out. Solution: Move more profiling code to profiler.c. (Yegappan Lakshmanan, closes #4668) --- src/ex_cmds2.c | 219 --------------------------------------------------------- 1 file changed, 219 deletions(-) (limited to 'src/ex_cmds2.c') diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 77ff08cf7c..a275fb8b70 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -395,140 +395,6 @@ timer_free_all() # 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 /* @@ -3534,91 +3400,6 @@ get_one_sourceline(struct source_cookie *sp) 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. */ -- cgit v1.2.3