[PATCH v2 2/2] merge-ort: do leave Trace2 region even if checkout fails
- From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Jul 29, 2022, 17:12 UTC
- Message-ID
- <d2e1af0f922ea5316074dd0867c66650161b0ab5.1659114727.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.1307.v2.git.1659114727.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
In 557ac0350d9 (merge-ort: begin performance work; instrument with trace2_region_* calls, 2021-01-23), we added Trace2 instrumentation, but in the error path that returns early, we forgot to tell Trace2 that we're leaving the region. Let's fix that.
Pointed-out-by: Elijah Newren <newren@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- merge-ort.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/merge-ort.c b/merge-ort.c index e820e45a8e8..eb0296902ad 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -3158,6 +3158,7 @@ void merge_switch_to_result(struct merge_options *opt, /* failure to function */ result->clean = -1; merge_finalize(opt, result); + trace2_region_leave("merge", "checkout", opt->repo); return; } trace2_region_leave("merge", "checkout", opt->repo); @@ -3169,6 +3170,8 @@ void merge_switch_to_result(struct merge_options *opt, /* failure to function */ result->clean = -1; merge_finalize(opt, result); + trace2_region_leave("merge", "record_conflicted", + opt->repo); return; } trace2_region_leave("merge", "record_conflicted", opt->repo);
-- gitgitgadget