@matheusbsbs / matheus-bagliano / commits / 0d1ed5963d

unpack-trees: add performance tracing

We're going to optimize unpack_trees() a bit in the following patches. Let's add some tracing to measure how long it takes before and after. This is the baseline ("git checkout -" on webkit.git, 275k files on worktree) performance: 0.056651714 s: read cache .git/index performance: 0.183101080 s: preload index performance: 0.008584433 s: refresh index performance: 0.633767589 s: traverse_trees performance: 0.340265448 s: check_updates performance: 0.381884638 s: cache_tree_update performance: 1.401562947 s: unpack_trees performance: 0.338687914 s: write index, changed mask = 2e performance: 0.411927922 s: traverse_trees performance: 0.000023335 s: check_updates performance: 0.423697246 s: unpack_trees performance: 0.423708360 s: diff-index performance: 2.559524127 s: git command: git checkout - Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Nguyễn Thái Ngọc Duy committed Aug 18, 2018 at 16:41 UTC 0d1ed5963da5d7410ad86eeaa64b3710e4aaa0c0
2 files changed +10 -1
cache-tree.c
+2
@@ -433,7 +433,9 @@ int cache_tree_update(struct index_state *istate, int flags)
433
434 if (i)
435 return i;
436 + trace_performance_enter();
437 i = update_one(it, cache, entries, "", 0, &skip, flags);
438 + trace_performance_leave("cache_tree_update");
439 if (i < 0)
440 return i;
441 istate->cache_changed |= CACHE_TREE_CHANGED;
unpack-trees.c
+8 -1
@@ -345,6 +345,7 @@ static int check_updates(struct unpack_trees_options *o)
345 struct checkout state = CHECKOUT_INIT;
346 int i;
347
348 + trace_performance_enter();
349 state.force = 1;
350 state.quiet = 1;
351 state.refresh_cache = 1;
@@ -414,6 +415,7 @@ static int check_updates(struct unpack_trees_options *o)
415 errs |= finish_delayed_checkout(&state);
416 if (o->update)
417 git_attr_set_direction(GIT_ATTR_CHECKIN, NULL);
418 + trace_performance_leave("check_updates");
419 return errs != 0;
420 }
421
@@ -1285,6 +1287,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
1287 if (len > MAX_UNPACK_TREES)
1288 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
1289
1290 + trace_performance_enter();
1291 memset(&el, 0, sizeof(el));
1292 if (!core_apply_sparse_checkout || !o->update)
1293 o->skip_sparse_checkout = 1;
@@ -1357,7 +1360,10 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
1360 }
1361 }
1362
1360 - if (traverse_trees(len, t, &info) < 0)
1363 + trace_performance_enter();
1364 + ret = traverse_trees(len, t, &info);
1365 + trace_performance_leave("traverse_trees");
1366 + if (ret < 0)
1367 goto return_failed;
1368 }
1369
@@ -1449,6 +1455,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
1455 o->src_index = NULL;
1456
1457 done:
1458 + trace_performance_leave("unpack_trees");
1459 clear_exclude_list(&el);
1460 return ret;
1461