Git fork

Merge branch 'jh/trace2'

A few embarrassing bugfixes.

* jh/trace2:
trace2: fix up a missing "leave" entry point
trace2: fix incorrect function pointer check

+2 -2
+1 -1
read-cache.c
··· 3131 3131 trace2_region_enter_printf("index", "shared/do_write_index", 3132 3132 the_repository, "%s", (*temp)->filename.buf); 3133 3133 ret = do_write_index(si->base, *temp, 1); 3134 - trace2_region_enter_printf("index", "shared/do_write_index", 3134 + trace2_region_leave_printf("index", "shared/do_write_index", 3135 3135 the_repository, "%s", (*temp)->filename.buf); 3136 3136 3137 3137 if (ret)
+1 -1
trace2.c
··· 734 734 us_elapsed_region = tr2tls_region_elasped_self(us_now); 735 735 736 736 for_each_wanted_builtin (j, tgt_j) 737 - if (tgt_j->pfn_data_fl) 737 + if (tgt_j->pfn_data_json_fl) 738 738 tgt_j->pfn_data_json_fl(file, line, us_elapsed_absolute, 739 739 us_elapsed_region, category, 740 740 repo, key, value);