fetch: add trace2 instrumentation
Add trace2 regions to fetch-pack.c and builtins/fetch.c to better track time spent in the various phases of a fetch: * listing refs * negotiation for protocol versions v0-v2 * fetching refs * consuming refs Signed-off-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Josh Steadmon committed
Oct 2, 2019 at 16:49 UTC
5fc31180d87c5f20c4cdfb89f93daf77c3bd50a1
2 files changed
+27
-8
builtin/fetch.c
+15
-7
@@ -1071,8 +1071,11 @@ static int check_exist_and_connected(struct ref *ref_map)
1071
static int fetch_refs(struct transport *transport, struct ref *ref_map)
1072
{
1073
int ret = check_exist_and_connected(ref_map);
1074
- if (ret)
1074
+ if (ret) {
1075
+ trace2_region_enter("fetch", "fetch_refs", the_repository);
1076
ret = transport_fetch_refs(transport, ref_map);
1077
+ trace2_region_leave("fetch", "fetch_refs", the_repository);
1078
+ }
1079
if (!ret)
1080
/*
1081
* Keep the new pack's ".keep" file around to allow the caller
@@ -1088,11 +1091,14 @@ static int consume_refs(struct transport *transport, struct ref *ref_map)
1091
{
1092
int connectivity_checked = transport->smart_options
1093
? transport->smart_options->connectivity_checked : 0;
1091
- int ret = store_updated_refs(transport->url,
1092
- transport->remote->name,
1093
- connectivity_checked,
1094
- ref_map);
1094
+ int ret;
1095
+ trace2_region_enter("fetch", "consume_refs", the_repository);
1096
+ ret = store_updated_refs(transport->url,
1097
+ transport->remote->name,
1098
+ connectivity_checked,
1099
+ ref_map);
1100
transport_unlock_pack(transport);
1101
+ trace2_region_leave("fetch", "consume_refs", the_repository);
1102
return ret;
1103
}
1104
@@ -1337,9 +1343,11 @@ static int do_fetch(struct transport *transport,
1343
argv_array_push(&ref_prefixes, "refs/tags/");
1344
}
1345
1340
- if (must_list_refs)
1346
+ if (must_list_refs) {
1347
+ trace2_region_enter("fetch", "remote_refs", the_repository);
1348
remote_refs = transport_get_remote_refs(transport, &ref_prefixes);
1342
- else
1349
+ trace2_region_leave("fetch", "remote_refs", the_repository);
1350
+ } else
1351
remote_refs = NULL;
1352
1353
argv_array_clear(&ref_prefixes);
fetch-pack.c
+12
-1
@@ -382,6 +382,7 @@ static int find_common(struct fetch_negotiator *negotiator,
382
state_len = 0;
383
}
384
385
+ trace2_region_enter("fetch-pack", "negotiation_v0_v1", the_repository);
386
flushes = 0;
387
retval = -1;
388
if (args->no_dependents)
@@ -466,6 +467,7 @@ static int find_common(struct fetch_negotiator *negotiator,
467
}
468
}
469
done:
470
+ trace2_region_leave("fetch-pack", "negotiation_v0_v1", the_repository);
471
if (!got_ready || !no_done) {
472
packet_buf_write(&req_buf, "done\n");
473
send_request(args, fd[1], &req_buf);
@@ -1378,7 +1380,7 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
1380
enum fetch_state state = FETCH_CHECK_LOCAL;
1381
struct oidset common = OIDSET_INIT;
1382
struct packet_reader reader;
1381
- int in_vain = 0;
1383
+ int in_vain = 0, negotiation_started = 0;
1384
int haves_to_send = INITIAL_FLUSH;
1385
struct fetch_negotiator negotiator;
1386
fetch_negotiator_init(r, &negotiator);
@@ -1421,6 +1423,12 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
1423
}
1424
break;
1425
case FETCH_SEND_REQUEST:
1426
+ if (!negotiation_started) {
1427
+ negotiation_started = 1;
1428
+ trace2_region_enter("fetch-pack",
1429
+ "negotiation_v2",
1430
+ the_repository);
1431
+ }
1432
if (send_fetch_request(&negotiator, fd[1], args, ref,
1433
&common,
1434
&haves_to_send, &in_vain,
@@ -1444,6 +1452,9 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
1452
}
1453
break;
1454
case FETCH_GET_PACK:
1455
+ trace2_region_leave("fetch-pack",
1456
+ "negotiation_v2",
1457
+ the_repository);
1458
/* Check for shallow-info section */
1459
if (process_section_header(&reader, "shallow-info", 1))
1460
receive_shallow_info(args, &reader, shallows, si);