From 050b8ff8049b992a1cad039558e62b80d3a1f8f7 Mon Sep 17 00:00:00 2001 From: Jeff Hostetler Date: Thu, 13 Jun 2019 09:28:41 -0400 Subject: [PATCH 1/2] fixup! trace2:gvfs:experiment: prime_cache_tree This reverts commit 2023a0c728dfbffa1a59bc6c4d58a70d5d774fb6. Reverting in favor of moving the tracing into the prime_cache_tree function rather than the single caller in this commit. --- builtin/reset.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/builtin/reset.c b/builtin/reset.c index cc3c9b31367629..354fe4df5f91c2 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -100,9 +100,7 @@ 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 16290c1d076437e6832e0e425575d79595ce6fa9 Mon Sep 17 00:00:00 2001 From: Jeff Hostetler Date: Mon, 3 Jun 2019 11:53:08 -0400 Subject: [PATCH 2/2] trace2:gvfs:experiment: add prime_cache_tree region Signed-off-by: Jeff Hostetler --- cache-tree.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cache-tree.c b/cache-tree.c index 67c0a1c7f8f519..131e849f96c9fd 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -715,10 +715,14 @@ void prime_cache_tree(struct repository *r, struct index_state *istate, struct tree *tree) { + trace2_region_enter("cache_tree", "prime_cache_tree", r); + cache_tree_free(&istate->cache_tree); istate->cache_tree = cache_tree(); prime_cache_tree_rec(r, istate->cache_tree, tree); istate->cache_changed |= CACHE_TREE_CHANGED; + + trace2_region_leave("cache_tree", "prime_cache_tree", r); } /*