From 22a7338318e3709b578d5c041af0afaf95b8fe21 Mon Sep 17 00:00:00 2001 From: Josh Steadmon Date: Thu, 25 Apr 2019 10:08:53 -0700 Subject: [PATCH 1/2] trace2: fix incorrect function pointer check Fix trace2_data_json_fl() to check for the presence of pfn_data_json_fl in its targets, rather than pfn_data_fl, which is not actually called. Signed-off-by: Josh Steadmon Signed-off-by: Junio C Hamano --- trace2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trace2.c b/trace2.c index ccccd4ef09..590e5542c5 100644 --- a/trace2.c +++ b/trace2.c @@ -710,7 +710,7 @@ void trace2_data_json_fl(const char *file, int line, const char *category, us_elapsed_region = tr2tls_region_elasped_self(us_now); for_each_wanted_builtin (j, tgt_j) - if (tgt_j->pfn_data_fl) + if (tgt_j->pfn_data_json_fl) tgt_j->pfn_data_json_fl(file, line, us_elapsed_absolute, us_elapsed_region, category, repo, key, value); From c173542c84cdf5e71b393e91f9d9664a85f995b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Fri, 10 May 2019 15:37:38 +0200 Subject: [PATCH 2/2] trace2: fix up a missing "leave" entry point MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix a trivial bug that's been here since the shared/do_write_index tracing was added in 42fee7a388 ("trace2:data: add trace2 instrumentation to index read/write", 2019-02-22). We should have enter/leave points, not two enter/enter points. This resulted in an "enter" event without a corresponding "leave" event. Signed-off-by: Ævar Arnfjörð Bjarmason Acked-by: Derrick Stolee Signed-off-by: Junio C Hamano --- read-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/read-cache.c b/read-cache.c index eee8351d8e..49329a1fb1 100644 --- a/read-cache.c +++ b/read-cache.c @@ -3127,7 +3127,7 @@ static int write_shared_index(struct index_state *istate, trace2_region_enter_printf("index", "shared/do_write_index", the_repository, "%s", (*temp)->filename.buf); ret = do_write_index(si->base, *temp, 1); - trace2_region_enter_printf("index", "shared/do_write_index", + trace2_region_leave_printf("index", "shared/do_write_index", the_repository, "%s", (*temp)->filename.buf); if (ret)