Skip to content

Commit 0d1ed59

Browse files
pcloudsgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c46c406 commit 0d1ed59

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

cache-tree.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,9 @@ int cache_tree_update(struct index_state *istate, int flags)
433433

434434
if (i)
435435
return i;
436+
trace_performance_enter();
436437
i = update_one(it, cache, entries, "", 0, &skip, flags);
438+
trace_performance_leave("cache_tree_update");
437439
if (i < 0)
438440
return i;
439441
istate->cache_changed |= CACHE_TREE_CHANGED;

unpack-trees.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@ static int check_updates(struct unpack_trees_options *o)
345345
struct checkout state = CHECKOUT_INIT;
346346
int i;
347347

348+
trace_performance_enter();
348349
state.force = 1;
349350
state.quiet = 1;
350351
state.refresh_cache = 1;
@@ -414,6 +415,7 @@ static int check_updates(struct unpack_trees_options *o)
414415
errs |= finish_delayed_checkout(&state);
415416
if (o->update)
416417
git_attr_set_direction(GIT_ATTR_CHECKIN, NULL);
418+
trace_performance_leave("check_updates");
417419
return errs != 0;
418420
}
419421

@@ -1285,6 +1287,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
12851287
if (len > MAX_UNPACK_TREES)
12861288
die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
12871289

1290+
trace_performance_enter();
12881291
memset(&el, 0, sizeof(el));
12891292
if (!core_apply_sparse_checkout || !o->update)
12901293
o->skip_sparse_checkout = 1;
@@ -1357,7 +1360,10 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
13571360
}
13581361
}
13591362

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)
13611367
goto return_failed;
13621368
}
13631369

@@ -1449,6 +1455,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
14491455
o->src_index = NULL;
14501456

14511457
done:
1458+
trace_performance_leave("unpack_trees");
14521459
clear_exclude_list(&el);
14531460
return ret;
14541461

0 commit comments

Comments
 (0)