THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

Merge branch 'jh/trace2'

A few embarrassing bugfixes.

* jh/trace2:
  trace2: fix up a missing "leave" entry point
  trace2: fix incorrect function pointer check
tags/v2.22.0-rc0
Junio C Hamano 5 months ago
parent
commit
49bc8ce539
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      read-cache.c
  2. 1
    1
      trace2.c

+ 1
- 1
read-cache.c View File

@@ -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)

+ 1
- 1
trace2.c View File

@@ -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);

Loading…
Cancel
Save