Skip to content

Commit c12bd0e

Browse files
jeffhostetlerdscho
authored andcommitted
Trace2:gvfs:experiment: capture more 'tracking' details
Update tracing around report_tracking() to use 'tracking' category rather than 'exp' category. Add ahead/behind results from stat_tracking_info(). Signed-off-by: Jeff Hostetler <[email protected]>
1 parent a69cbbe commit c12bd0e

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

builtin/checkout.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -909,12 +909,12 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
909909
(new_branch_info->path || (!opts->force_detach && !strcmp(new_branch_info->name, "HEAD")))) {
910910
unsigned long nr_unpack_entry_at_start;
911911

912-
trace2_region_enter("exp", "report_tracking", the_repository);
912+
trace2_region_enter("tracking", "report_tracking", the_repository);
913913
nr_unpack_entry_at_start = get_nr_unpack_entry();
914914
report_tracking(new_branch_info);
915-
trace2_data_intmax("exp", NULL, "report_tracking/nr_unpack_entries",
915+
trace2_data_intmax("tracking", NULL, "report_tracking/nr_unpack_entries",
916916
(intmax_t)(get_nr_unpack_entry() - nr_unpack_entry_at_start));
917-
trace2_region_leave("exp", "report_tracking", the_repository);
917+
trace2_region_leave("tracking", "report_tracking", the_repository);
918918
}
919919
}
920920

remote.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2003,7 +2003,16 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb,
20032003
char *base;
20042004
int upstream_is_gone = 0;
20052005

2006+
trace2_region_enter("tracking", "stat_tracking_info", NULL);
20062007
sti = stat_tracking_info(branch, &ours, &theirs, &full_base, 0, abf);
2008+
trace2_data_intmax("tracking", NULL, "stat_tracking_info/ab_flags", abf);
2009+
trace2_data_intmax("tracking", NULL, "stat_tracking_info/ab_result", sti);
2010+
if (abf == AHEAD_BEHIND_FULL) {
2011+
trace2_data_intmax("tracking", NULL, "stat_tracking_info/ab_ahead", ours);
2012+
trace2_data_intmax("tracking", NULL, "stat_tracking_info/ab_behind", theirs);
2013+
}
2014+
trace2_region_leave("tracking", "stat_tracking_info", NULL);
2015+
20072016
if (sti < 0) {
20082017
if (!full_base)
20092018
return 0;

0 commit comments

Comments
 (0)