Re: comparing file contents in is_exact_match?
- From
- Florian Weimer <fw@deneb.enyo.de>
- Date
- Jul 7, 2006, 16:33 UTC
- Message-ID
- <87k66p8jee.fsf@mid.deneb.enyo.de>
- In-Reply-To
- <20060706055729.GA12512@admingilde.org>
* Martin Waitz:
Show 7 quoted lines
> I created a git repository for my photo collection and then renamed > some photos (about 600). Now git status and commit get hit by > the OOM killer. > > The reason for that is that is_exact_match (in diffcore-rename.c) maps > both the source and destination file into memory and then compares them > byte for byte. This is a little bit too much for my little machine.
Uhm, this shouldn't trigger the OOM killer, really. You already have physical backing storage for both files, so this shouldn't count towards the OOM limit. Ah, diff_populate_filespec has the following:
s->data = mmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0);
Perhaps the following patch is in order? On some systems, MAP_PRIVATE might guarantee some form of repeatable reads, but I don't think GIT needs this to guard against concurrent modification.
-- >8 -- diff_populate_filespec: use shared mapping
It seems that on some systems, PROT_READ + MAP_PRIVATE counts towards the OOM limit, even though no additional backing store is required. Requesting MAP_SHARED mapping should fix this.
Signed-off-by: Florian Weimer <fw@deneb.enyo.de> --- diff.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/diff.c b/diff.c index 428ff78..2b4367e 100644 --- a/diff.c +++ b/diff.c @@ -1007,7 +1007,7 @@ int diff_populate_filespec(struct diff_f fd = open(s->path, O_RDONLY); if (fd < 0) goto err_empty; - s->data = mmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0); + s->data = mmap(NULL, s->size, PROT_READ, MAP_SHARED, fd, 0); close(fd); if (s->data == MAP_FAILED) goto err_empty; -- 1.4.0