Skip to content

Gvfs trace2 checkout and reset experiment #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffhostetler merged 4 commits into from
May 1, 2019
Merged

Gvfs trace2 checkout and reset experiment #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
253ca76
trace2:gvfs:experiment: clear_ce_flags_1
jeffhostetler Apr 30, 2019
51804fb
trace2:gvfs:experiment: prime_cache_tree
jeffhostetler Apr 30, 2019
fa5a6dc
trace2:gvfs:experiment: traverse_trees
jeffhostetler Apr 30, 2019
cab7dad
trace2:gvfs:experiment: report_tracking
jeffhostetler Apr 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion builtin/checkout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,8 +856,11 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
remove_branch_state(the_repository);
strbuf_release(&msg);
if (!opts->quiet &&
(new_branch_info->path || (!opts->force_detach && !strcmp(new_branch_info->name, "HEAD"))))
(new_branch_info->path || (!opts->force_detach && !strcmp(new_branch_info->name, "HEAD")))) {
trace2_region_enter("exp", "report_tracking", the_repository);
report_tracking(new_branch_info);
trace2_region_leave("exp", "report_tracking", the_repository);
}
}

static int add_pending_uninteresting_ref(const char *refname,
Expand Down
2 changes: 2 additions & 0 deletions builtin/reset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ static int reset_index(const struct object_id *oid, int reset_type, int quiet)

if (reset_type == MIXED || reset_type == HARD) {
tree = parse_tree_indirect(oid);
trace2_region_enter("exp", "prime_cache_tree", the_repository);
prime_cache_tree(the_repository, the_repository->index, tree);
trace2_region_leave("exp", "prime_cache_tree", the_repository);
}

ret = 0;
Expand Down
12 changes: 11 additions & 1 deletion unpack-trees.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1426,15 +1426,23 @@ static int clear_ce_flags(struct index_state *istate,
struct exclude_list *el)
{
static struct strbuf prefix = STRBUF_INIT;
char label[100];
int rval;

strbuf_reset(&prefix);

return clear_ce_flags_1(istate,
xsnprintf(label, sizeof(label), "clear_ce_flags(0x%08lx,0x%08lx)",
(unsigned long)select_mask, (unsigned long)clear_mask);
trace2_region_enter("exp", label, the_repository);
rval = clear_ce_flags_1(istate,
istate->cache,
istate->cache_nr,
&prefix,
select_mask, clear_mask,
el, 0);
trace2_region_leave("exp", label, the_repository);

return rval;
}

/*
Expand Down Expand Up @@ -1565,7 +1573,9 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
}

trace_performance_enter();
trace2_region_enter("exp", "traverse_trees", the_repository);
ret = traverse_trees(o->src_index, len, t, &info);
trace2_region_leave("exp", "traverse_trees", the_repository);
trace_performance_leave("traverse_trees");
if (ret < 0)
goto return_failed;
Expand Down