@matheusbsbs / matheus-bagliano / commits / 60ab26de99
Fork 0

[PATCH] Avoid wasting memory in git-rev-list

As pointed out on the list, git-rev-list can use a lot of memory. One low-hanging fruit is to free the commit buffer for commits that we parse. By default, parse_commit() will save away the buffer, since a lot of cases do want it, and re-reading it continually would be unnecessary. However, in many cases the buffer isn't actually necessary and saving it just wastes memory. We could just free the buffer ourselves, but especially in git-rev-list, we actually end up using the helper functions that automatically add parent commits to the commit lists, so we don't actually control the commit parsing directly. Instead, just make this behaviour of "parse_commit()" a global flag. Maybe this is a bit tasteless, but it's very simple, and it makes a noticable difference in memory usage. Before the change: [torvalds@g5 linux]$ /usr/bin/time git-rev-list v2.6.12..HEAD > /dev/null 0.26user 0.02system 0:00.28elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+3714minor)pagefaults 0swaps after the change: [torvalds@g5 linux]$ /usr/bin/time git-rev-list v2.6.12..HEAD > /dev/null 0.26user 0.00system 0:00.27elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+2433minor)pagefaults 0swaps note how the minor faults have decreased from 3714 pages to 2433 pages. That's all due to the fewer anonymous pages allocated to hold the comment buffers and their metadata. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Linus Torvalds committed Sep 15, 2005 at 14:43 UTC 60ab26de9970ce829c95eb11ebb407fe95780148
3 files changed +6 -1
commit.c
+3 -1
@@ -3,6 +3,8 @@
3 #include "commit.h"
4 #include "cache.h"
5
6 +int save_commit_buffer = 1;
7 +
8 struct sort_node
9 {
10 /*
@@ -264,7 +266,7 @@ int parse_commit(struct commit *item)
266 sha1_to_hex(item->object.sha1));
267 }
268 ret = parse_commit_buffer(item, buffer, size);
267 - if (!ret) {
269 + if (save_commit_buffer && !ret) {
270 item->buffer = buffer;
271 return 0;
272 }
commit.h
+1
@@ -17,6 +17,7 @@ struct commit {
17 char *buffer;
18 };
19
20 +extern int save_commit_buffer;
21 extern const char *commit_type;
22
23 struct commit *lookup_commit(const unsigned char *sha1);
rev-list.c
+2
@@ -582,6 +582,8 @@ int main(int argc, char **argv)
582 handle_one_commit(commit, &list);
583 }
584
585 + save_commit_buffer = verbose_header;
586 +
587 if (!merge_order) {
588 sort_by_date(&list);
589 if (limited)