Skip to content

Commit 578da03

Browse files
kbleesgitster
authored andcommitted
git: add performance tracing for git's main() function to debug scripts
Use trace_performance to measure and print execution time and command line arguments of the entire main() function. In constrast to the shell's 'time' utility, which measures total time of the parent process, this logs all involved git commands recursively. This is particularly useful to debug performance issues of scripted commands (i.e. which git commands were called with which parameters, and how long did they execute). Due to git's deliberate use of exit(), the implementation uses an atexit routine rather than just adding trace_performance_since() at the end of main(). Usage example: > GIT_TRACE_PERFORMANCE=~/git-trace.log git stash list Creates a log file like this: 23:57:38.638765 trace.c:405 performance: 0.000310107 s: git command: 'git' 'rev-parse' '--git-dir' 23:57:38.644387 trace.c:405 performance: 0.000261759 s: git command: 'git' 'rev-parse' '--show-toplevel' 23:57:38.646207 trace.c:405 performance: 0.000304468 s: git command: 'git' 'config' '--get-colorbool' 'color.interactive' 23:57:38.648491 trace.c:405 performance: 0.000241667 s: git command: 'git' 'config' '--get-color' 'color.interactive.help' 'red bold' 23:57:38.650465 trace.c:405 performance: 0.000243063 s: git command: 'git' 'config' '--get-color' '' 'reset' 23:57:38.654850 trace.c:405 performance: 0.025126313 s: git command: 'git' 'stash' 'list' Signed-off-by: Karsten Blees <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 09b2c1c commit 578da03

File tree

4 files changed

+30
-0
lines changed

4 files changed

+30
-0
lines changed

Documentation/git.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -938,6 +938,11 @@ Unsetting the variable, or setting it to empty, "0" or
938938
starting with "PACK".
939939
See 'GIT_TRACE' for available trace output options.
940940

941+
'GIT_TRACE_PERFORMANCE'::
942+
Enables performance related trace messages, e.g. total execution
943+
time of each Git command.
944+
See 'GIT_TRACE' for available trace output options.
945+
941946
'GIT_TRACE_SETUP'::
942947
Enables trace messages printing the .git, working tree and current
943948
working directory after Git has completed its setup phase.

git.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,6 +568,8 @@ int main(int argc, char **av)
568568

569569
git_setup_gettext();
570570

571+
trace_command_performance(argv);
572+
571573
/*
572574
* "git-xxxx" is the same as "git xxxx", but we obviously:
573575
*

trace.c

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,3 +404,25 @@ inline uint64_t getnanotime(void)
404404
return now;
405405
}
406406
}
407+
408+
static uint64_t command_start_time;
409+
static struct strbuf command_line = STRBUF_INIT;
410+
411+
static void print_command_performance_atexit(void)
412+
{
413+
trace_performance_since(command_start_time, "git command:%s",
414+
command_line.buf);
415+
}
416+
417+
void trace_command_performance(const char **argv)
418+
{
419+
if (!trace_want(&trace_perf_key))
420+
return;
421+
422+
if (!command_start_time)
423+
atexit(print_command_performance_atexit);
424+
425+
strbuf_reset(&command_line);
426+
sq_quote_argv(&command_line, argv, 0);
427+
command_start_time = getnanotime();
428+
}

trace.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ extern void trace_repo_setup(const char *prefix);
1717
extern int trace_want(struct trace_key *key);
1818
extern void trace_disable(struct trace_key *key);
1919
extern uint64_t getnanotime(void);
20+
extern void trace_command_performance(const char **argv);
2021

2122
#ifndef HAVE_VARIADIC_MACROS
2223

0 commit comments

Comments
 (0)