Skip to content

unpack-trees: add trace2 regions around each use #132

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

Closed
derrickstolee wants to merge 1 commit into from
Closed

unpack-trees: add trace2 regions around each use #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions builtin/checkout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,10 @@ static int merge_working_tree(const struct checkout_opts *opts,
tree = parse_tree_indirect(&new_branch_info->commit->object.oid);
init_tree_desc(&trees[1], tree->buffer, tree->size);

trace2_region_enter("unpack-trees", "checkout", the_repository);
ret = unpack_trees(2, trees, &topts);
trace2_region_leave("unpack-trees", "checkout", the_repository);

clear_unpack_trees_porcelain(&topts);
if (ret == -1) {
/*
Expand Down
8 changes: 6 additions & 2 deletions builtin/rebase.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ static int reset_head(struct object_id *oid, const char *action,
size_t prefix_len;
struct object_id *orig = NULL, oid_orig,
*old_orig = NULL, oid_old_orig;
int ret = 0, nr = 0;
int ret = 0, nr = 0, unpack_trees_result;

if (switch_to_branch && !starts_with(switch_to_branch, "refs/"))
BUG("Not a fully qualified branch: '%s'", switch_to_branch);
Expand Down Expand Up @@ -435,7 +435,11 @@ static int reset_head(struct object_id *oid, const char *action,
goto leave_reset_head;
}

if (unpack_trees(nr, desc, &unpack_tree_opts)) {
trace2_region_enter("unpack-trees", "rebase", the_repository);
unpack_trees_result = unpack_trees(nr, desc, &unpack_tree_opts);
trace2_region_leave("unpack-trees", "rebase", the_repository);

if (unpack_trees_result) {
ret = -1;
goto leave_reset_head;
}
Expand Down
3 changes: 3 additions & 0 deletions merge-recursive.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,10 @@ static int unpack_trees_start(struct merge_options *o,
init_tree_desc_from_tree(t+1, head);
init_tree_desc_from_tree(t+2, merge);

trace2_region_enter("unpack-trees", "merge-recursive", the_repository);
rc = unpack_trees(3, t, &o->unpack_opts);
trace2_region_leave("unpack-trees", "merge-recursive", the_repository);

cache_tree_free(&active_cache_tree);

/*
Expand Down
8 changes: 6 additions & 2 deletions merge.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ int checkout_fast_forward(struct repository *r,
struct tree *trees[MAX_UNPACK_TREES];
struct unpack_trees_options opts;
struct tree_desc t[MAX_UNPACK_TREES];
int i, nr_trees = 0;
int i, nr_trees = 0, unpack_trees_result;
struct dir_struct dir;
struct lock_file lock_file = LOCK_INIT;

Expand Down Expand Up @@ -96,7 +96,11 @@ int checkout_fast_forward(struct repository *r,
opts.fn = twoway_merge;
setup_unpack_trees_porcelain(&opts, "merge");

if (unpack_trees(nr_trees, t, &opts)) {
trace2_region_enter("unpack-trees", "merge", r);
unpack_trees_result = unpack_trees(nr_trees, t, &opts);
trace2_region_leave("unpack-trees", "merge", r);

if (unpack_trees_result) {
rollback_lock_file(&lock_file);
clear_unpack_trees_porcelain(&opts);
return -1;
Expand Down
8 changes: 6 additions & 2 deletions sequencer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2941,7 +2941,7 @@ static int do_reset(const char *name, int len, struct replay_opts *opts)
struct tree_desc desc;
struct tree *tree;
struct unpack_trees_options unpack_tree_opts;
int ret = 0;
int ret = 0, unpack_trees_result;

if (hold_locked_index(&lock, LOCK_REPORT_ON_ERROR) < 0)
return -1;
Expand Down Expand Up @@ -3002,7 +3002,11 @@ static int do_reset(const char *name, int len, struct replay_opts *opts)
return -1;
}

if (unpack_trees(1, &desc, &unpack_tree_opts)) {
trace2_region_enter("unpack-trees", "sequencer", the_repository);
unpack_trees_result = unpack_trees(1, &desc, &unpack_tree_opts);
trace2_region_leave("unpack-trees", "sequencer", the_repository);

if (unpack_trees_result) {
rollback_lock_file(&lock);
free((void *)desc.buffer);
strbuf_release(&ref_name);
Expand Down