mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trace2:data: add trace2 regions to wt-status

Browse Source 
Add trace2_region_enter() and trace2_region_leave() calls around the
various phases of a status scan.  This gives elapsed time for each
phase in the GIT_TR2_PERF and GIT_TR2_EVENT trace target.

Also, these Trace2 calls now use s->repo rather than the_repository.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff Hostetler
2019-02-22 14:25:03 -08:00
committed by Junio C Hamano
parent 353d3d77f4
commit 942b2740ff
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wt-status.c
View File

@ -748,12 +748,23 @@ static int has_unmerged(struct wt_status *s)
void wt_status_collect(struct wt_status *s) void wt_status_collect(struct wt_status *s)
{ {
trace2_region_enter("status", "worktrees", s->repo);
wt_status_collect_changes_worktree(s); wt_status_collect_changes_worktree(s);
if (s->is_initial) trace2_region_leave("status", "worktrees", s->repo);
if (s->is_initial) {
trace2_region_enter("status", "initial", s->repo);
wt_status_collect_changes_initial(s); wt_status_collect_changes_initial(s);
else trace2_region_leave("status", "initial", s->repo);
} else {
trace2_region_enter("status", "index", s->repo);
wt_status_collect_changes_index(s); wt_status_collect_changes_index(s);
trace2_region_leave("status", "index", s->repo);
}
trace2_region_enter("status", "untracked", s->repo);
wt_status_collect_untracked(s); wt_status_collect_untracked(s);
trace2_region_leave("status", "untracked", s->repo);
wt_status_get_state(s->repo, &s->state, s->branch && !strcmp(s->branch, "HEAD")); wt_status_get_state(s->repo, &s->state, s->branch && !strcmp(s->branch, "HEAD"));
if (s->state.merge_in_progress && !has_unmerged(s)) if (s->state.merge_in_progress && !has_unmerged(s))
@ -2291,6 +2302,13 @@ static void wt_porcelain_v2_print(struct wt_status *s)
void wt_status_print(struct wt_status *s) void wt_status_print(struct wt_status *s)
{ {
trace2_data_intmax("status", s->repo, "count/changed", s->change.nr);
trace2_data_intmax("status", s->repo, "count/untracked",
s->untracked.nr);
trace2_data_intmax("status", s->repo, "count/ignored", s->ignored.nr);
trace2_region_enter("status", "print", s->repo);
switch (s->status_format) { switch (s->status_format) {
case STATUS_FORMAT_SHORT: case STATUS_FORMAT_SHORT:
wt_shortstatus_print(s); wt_shortstatus_print(s);
@ -2309,6 +2327,8 @@ void wt_status_print(struct wt_status *s)
wt_longstatus_print(s); wt_longstatus_print(s);
break; break;
} }
trace2_region_leave("status", "print", s->repo);
} }
/** /**