git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 1/2] commit-graph: add trace2 instrumentation for generation DFS

From
Kristofer Karlsson via GitGitGadget <gitgitgadget@gmail.com>
Date
Jul 9, 2026, 15:03 UTC
Message-ID
<100efa22a9a2bb82b85c95fa2ce933311ca09ee3.1783609382.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.2170.v2.git.1783609382.gitgitgadget@gmail.com>
From: Kristofer Karlsson <krka@spotify.com>

Count the number of steps taken in compute_reachable_generation_numbers() and expose it via trace2 to make it easier to detect performance regressions.

Add a failing test for such a regression, introduced in 199d452758 (commit-graph: return the prepared commit graph from `prepare_commit_graph()`, 2025-09-04), where incremental commit-graph writes do not see existing generation numbers from lower graph layers and fall back to walking the full ancestry.

Signed-off-by: Kristofer Karlsson <krka@spotify.com>
---
 commit-graph.c                |  5 +++++
 t/t5324-split-commit-graph.sh | 24 ++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
diff --git a/commit-graph.c b/commit-graph.c
index c6d9c5c740..702ba9731b 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -1653,6 +1653,7 @@ static void compute_reachable_generation_numbers(
 {
 	int i;
 	struct commit_list *list = NULL;
+	intmax_t steps = 0;
 
 	for (i = 0; i < info->commits->nr; i++) {
 		struct commit *c = info->commits->items[i];
@@ -1671,6 +1672,7 @@ static void compute_reachable_generation_numbers(
 			int all_parents_computed = 1;
 			timestamp_t max_gen = 0;
 
+			steps++;
 			for (parent = current->parents; parent; parent = parent->next) {
 				repo_parse_commit(info->r, parent->item);
 				gen = info->get_generation(parent->item, info->data);
@@ -1694,6 +1696,9 @@ static void compute_reachable_generation_numbers(
 			}
 		}
 	}
+
+	trace2_data_intmax("commit-graph", info->r,
+			   "generation-dfs-steps", steps);
 }
 
 static timestamp_t get_topo_level(struct commit *c, void *data)
diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh
index 49a057cc2e..b41331e3dd 100755
--- a/t/t5324-split-commit-graph.sh
+++ b/t/t5324-split-commit-graph.sh
@@ -718,6 +718,30 @@ test_expect_success 'write generation data chunk when commit-graph chain is repl
 	)
 '
 
+test_expect_failure 'incremental write reads topo levels from all layers' '
+	git init topo-from-lower &&
+	(
+		cd topo-from-lower &&
+
+		for i in $(test_seq 5)
+		do
+			test_commit base-$i || return 1
+		done &&
+		git commit-graph write --reachable &&
+
+		test_commit extra &&
+		git commit-graph write --reachable --split=no-merge &&
+
+		git checkout base-3 &&
+		test_commit new-branch &&
+
+		GIT_TRACE2_EVENT="$(pwd)/trace.txt" \
+			git commit-graph write --reachable --split=no-merge &&
+
+		test_trace2_data commit-graph generation-dfs-steps 1 <trace.txt
+	)
+'
+
 test_expect_success 'temporary graph layer is discarded upon failure' '
 	git init layer-discard &&
 	(
-- 
gitgitgadget
Previous: Kristofer Karlsson via GitGitGadgetNext: Kristofer Karlsson via GitGitGadget
Message 26 of 28 in “commit-graph: fix topo_levels slab propagation regression”
  1. 0/2 commit-graph: fix topo_levels slab propagation regressionKristofer Karlsson via GitGitGadget, Jul 7, 2026
  2. 1/2 commit-graph: add trace2 instrumentation for generation DFSKristofer Karlsson via GitGitGadget, Jul 7, 2026
  3. Taylor BlauJul 7, 2026
  4. Kristofer KarlssonJul 7, 2026
  5. Taylor BlauJul 10, 2026
  6. Junio C HamanoJul 10, 2026
  7. Taylor BlauJul 10, 2026
  8. Junio C HamanoJul 11, 2026
  9. Kristofer KarlssonJul 13, 2026
  10. Junio C HamanoJul 13, 2026
  11. Kristofer KarlssonJul 13, 2026
  12. Junio C HamanoJul 7, 2026
  13. Kristofer KarlssonJul 7, 2026
  14. 2/2 commit-graph: propagate topo_levels slab to all chain layersKristofer Karlsson via GitGitGadget, Jul 7, 2026
  15. Taylor BlauJul 7, 2026
  16. Kristofer KarlssonJul 7, 2026
  17. Kristofer KarlssonJul 7, 2026
  18. Taylor BlauJul 10, 2026
  19. Patrick SteinhardtJul 13, 2026
  20. Taylor BlauJul 14, 2026
  21. Junio C HamanoJul 7, 2026
  22. Kristofer KarlssonJul 7, 2026
  23. Junio C HamanoJul 7, 2026
  24. Patrick SteinhardtJul 9, 2026
  25. 0/2 commit-graph: fix topo_levels slab propagation regressionKristofer Karlsson via GitGitGadget, Jul 9, 2026
  26. 1/2 commit-graph: add trace2 instrumentation for generation DFSKristofer Karlsson via GitGitGadget, Jul 9, 2026
  27. 2/2 commit-graph: propagate topo_levels slab to all chain layersKristofer Karlsson via GitGitGadget, Jul 9, 2026
  28. Taylor BlauJul 10, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.