Skip to content

Commit

Permalink
Trace2:gvfs:experiment: capture more 'tracking' details
Browse files Browse the repository at this point in the history
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 <jeffhost@microsoft.com>
  • Loading branch information
jeffhostetler authored and dscho committed Aug 11, 2023
1 parent f33e3c3 commit 10aaa06
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
6 changes: 3 additions & 3 deletions builtin/checkout.c
Original file line number Diff line number Diff line change
Expand Up @@ -1022,12 +1022,12 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
(new_branch_info->path || (!opts->force_detach && !strcmp(new_branch_info->name, "HEAD")))) {
unsigned long nr_unpack_entry_at_start;

trace2_region_enter("exp", "report_tracking", the_repository);
trace2_region_enter("tracking", "report_tracking", the_repository);
nr_unpack_entry_at_start = get_nr_unpack_entry();
report_tracking(new_branch_info);
trace2_data_intmax("exp", NULL, "report_tracking/nr_unpack_entries",
trace2_data_intmax("tracking", NULL, "report_tracking/nr_unpack_entries",
(intmax_t)(get_nr_unpack_entry() - nr_unpack_entry_at_start));
trace2_region_leave("exp", "report_tracking", the_repository);
trace2_region_leave("tracking", "report_tracking", the_repository);
}
}

Expand Down
10 changes: 10 additions & 0 deletions remote.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "setup.h"
#include "string-list.h"
#include "strvec.h"
#include "trace2.h"
#include "commit-reach.h"
#include "advice.h"
#include "connect.h"
Expand Down Expand Up @@ -2267,7 +2268,16 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb,
char *base;
int upstream_is_gone = 0;

trace2_region_enter("tracking", "stat_tracking_info", NULL);
sti = stat_tracking_info(branch, &ours, &theirs, &full_base, 0, abf);
trace2_data_intmax("tracking", NULL, "stat_tracking_info/ab_flags", abf);
trace2_data_intmax("tracking", NULL, "stat_tracking_info/ab_result", sti);
if (sti >= 0 && abf == AHEAD_BEHIND_FULL) {
trace2_data_intmax("tracking", NULL, "stat_tracking_info/ab_ahead", ours);
trace2_data_intmax("tracking", NULL, "stat_tracking_info/ab_behind", theirs);
}
trace2_region_leave("tracking", "stat_tracking_info", NULL);

if (sti < 0) {
if (!full_base)
return 0;
Expand Down

0 comments on commit 10aaa06

Please sign in to comment.