@matheusbsbs / matheus-bagliano / commits / 5bdbaaa4e9
Fork 0

[PATCH] Re-organize "git-rev-list --objects" logic

The logic to calculate the full object list used to be very inter-twined with the logic that looked up the commits. For no good reason - it's actually a lot simpler to just do that logic as a separate pass. This improves performance a bit, and uses slightly less memory in my tests, but more importantly it makes the code simpler to work with and follow what it does. The performance win is less than I had hoped for, but I get: Before: [torvalds@g5 linux]$ /usr/bin/time git-rev-list --objects v2.6.12..HEAD | wc -l 13.64user 0.42system 0:14.13elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+47947minor)pagefaults 0swaps 58945 After: [torvalds@g5 linux]$ /usr/bin/time git-rev-list --objects v2.6.12..HEAD | wc -l 11.80user 0.36system 0:12.16elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+42684minor)pagefaults 0swaps 58945 ie it improved by 2 seconds, and took a 5000+ fewer pages (hey, that's 20MB out of 174MB to go). And got the same number of objects (in theory, the more expensive one might find some more shared objects to avoid. In practice it obviously doesn't). I know how to make it use _lots_ less memory, which will probably speed it up. But that's for another time, and I'd prefer to see this go in first. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Linus Torvalds committed Sep 15, 2005 at 15:14 UTC 5bdbaaa4e9dd901dd2907b53bbecfdf3eac9276b
1 file changed +15 -25
rev-list.c
+15 -25
@@ -231,8 +231,6 @@ static void mark_parents_uninteresting(struct commit *commit)
231 {
232 struct commit_list *parents = commit->parents;
233
234 - if (tree_objects)
235 - mark_tree_uninteresting(commit->tree);
234 while (parents) {
235 struct commit *commit = parents->item;
236 commit->object.flags |= UNINTERESTING;
@@ -272,29 +270,6 @@ static int everybody_uninteresting(struct commit_list *orig)
270 continue;
271 return 0;
272 }
275 -
276 - /*
277 - * Ok, go back and mark all the edge trees uninteresting,
278 - * since otherwise we can have situations where a parent
279 - * that was marked uninteresting (and we never even had
280 - * to look at) had lots of objects that we don't want to
281 - * include.
282 - *
283 - * NOTE! This still doesn't mean that the object list is
284 - * "correct", since we may end up listing objects that
285 - * even older commits (that we don't list) do actually
286 - * reference, but it gets us to a minimal list (or very
287 - * close) in practice.
288 - */
289 - if (!tree_objects)
290 - return 1;
291 -
292 - while (orig) {
293 - struct commit *commit = orig->item;
294 - if (!parse_commit(commit) && commit->tree)
295 - mark_tree_uninteresting(commit->tree);
296 - orig = orig->next;
297 - }
273 return 1;
274 }
275
@@ -370,6 +345,19 @@ static struct commit_list *find_bisection(struct commit_list *list)
345 return best;
346 }
347
348 +static void mark_edges_uninteresting(struct commit_list *list)
349 +{
350 + for ( ; list; list = list->next) {
351 + struct commit_list *parents = list->item->parents;
352 +
353 + for ( ; parents; parents = parents->next) {
354 + struct commit *commit = parents->item;
355 + if (commit->object.flags & UNINTERESTING)
356 + mark_tree_uninteresting(commit->tree);
357 + }
358 + }
359 +}
360 +
361 static struct commit_list *limit_list(struct commit_list *list)
362 {
363 struct commit_list *newlist = NULL;
@@ -388,6 +376,8 @@ static struct commit_list *limit_list(struct commit_list *list)
376 }
377 p = &commit_list_insert(commit, p)->next;
378 }
379 + if (tree_objects)
380 + mark_edges_uninteresting(newlist);
381 if (bisect_list)
382 newlist = find_bisection(newlist);
383 return newlist;