Skip to content

Commit b837111

Browse files
committed
Revert "gvfs:trace2: add trace2 tracing around read_object_process"
This reverts commit e15d3e9.
1 parent 81291af commit b837111

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

sha1-file.c

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -745,8 +745,6 @@ static int read_object_process(const struct object_id *oid)
745745

746746
start = getnanotime();
747747

748-
trace2_region_enter("subprocess", "read_object", the_repository);
749-
750748
if (!subprocess_map_initialized) {
751749
subprocess_map_initialized = 1;
752750
hashmap_init(&subprocess_map, (hashmap_cmp_fn)cmd2process_cmp,
@@ -763,16 +761,13 @@ static int read_object_process(const struct object_id *oid)
763761
if (subprocess_start(&subprocess_map, &entry->subprocess, cmd,
764762
start_read_object_fn)) {
765763
free(entry);
766-
err = -1;
767-
goto leave_region;
764+
return -1;
768765
}
769766
}
770767
process = &entry->subprocess.process;
771768

772-
if (!(CAP_GET & entry->supported_capabilities)) {
773-
err = -1;
774-
goto leave_region;
775-
}
769+
if (!(CAP_GET & entry->supported_capabilities))
770+
return -1;
776771

777772
sigchain_push(SIGPIPE, SIG_IGN);
778773

@@ -821,10 +816,6 @@ static int read_object_process(const struct object_id *oid)
821816

822817
trace_performance_since(start, "read_object_process");
823818

824-
leave_region:
825-
trace2_region_leave_printf("subprocess", "read_object", the_repository,
826-
"result %d", err);
827-
828819
return err;
829820
}
830821

0 commit comments

Comments
 (0)