diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-13 14:50:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-13 14:50:35 (GMT) |
| commit | 49bc8ce539b24fc8dccf92bf0e23d184a8d07d4b (patch) | |
| tree | 8d790839b59f34c417814aac4babd46429b7e366 | |
| parent | 40bef4992ea86b79fa80ebd7e6fd19fecdc5879b (diff) | |
| parent | c173542c84cdf5e71b393e91f9d9664a85f995b2 (diff) | |
| download | git-49bc8ce539b24fc8dccf92bf0e23d184a8d07d4b.zip git-49bc8ce539b24fc8dccf92bf0e23d184a8d07d4b.tar.gz git-49bc8ce539b24fc8dccf92bf0e23d184a8d07d4b.tar.bz2 | |
Merge branch 'jh/trace2'
A few embarrassing bugfixes.
* jh/trace2:
trace2: fix up a missing "leave" entry point
trace2: fix incorrect function pointer check
| -rw-r--r-- | read-cache.c | 2 | ||||
| -rw-r--r-- | trace2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/read-cache.c b/read-cache.c index 61b043b..4fad4e3 100644 --- a/read-cache.c +++ b/read-cache.c @@ -3131,7 +3131,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) @@ -734,7 +734,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); |