From 253ca76a615ce8ff656e8c23d49fba198c7d294b Mon Sep 17 00:00:00 2001 From: Jeff Hostetler Date: Tue, 30 Apr 2019 14:12:51 -0400 Subject: [PATCH 1/4] trace2:gvfs:experiment: clear_ce_flags_1 Signed-off-by: Jeff Hostetler --- unpack-trees.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/unpack-trees.c b/unpack-trees.c index 4d63ee57054b97..cd08122d754309 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -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; } /* From 51804fb0fda2caa7d3b1f2378102321c5412de2f Mon Sep 17 00:00:00 2001 From: Jeff Hostetler Date: Tue, 30 Apr 2019 14:33:45 -0400 Subject: [PATCH 2/4] trace2:gvfs:experiment: prime_cache_tree Signed-off-by: Jeff Hostetler --- builtin/reset.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builtin/reset.c b/builtin/reset.c index 354fe4df5f91c2..cc3c9b31367629 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -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; From fa5a6dc5972bed382b20643ffd3b974583e1ce60 Mon Sep 17 00:00:00 2001 From: Jeff Hostetler Date: Tue, 30 Apr 2019 15:27:40 -0400 Subject: [PATCH 3/4] trace2:gvfs:experiment: traverse_trees Signed-off-by: Jeff Hostetler --- unpack-trees.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/unpack-trees.c b/unpack-trees.c index cd08122d754309..b3eb19c8bf57d6 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1573,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; From cab7dad20ded1d7ef50e0884e802bd9c640cf486 Mon Sep 17 00:00:00 2001 From: Jeff Hostetler Date: Tue, 30 Apr 2019 16:02:39 -0400 Subject: [PATCH 4/4] trace2:gvfs:experiment: report_tracking Signed-off-by: Jeff Hostetler --- builtin/checkout.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index c6065255647c9c..040690d3c25aed 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -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,