From: Jonathan Nieder Date: Sat, 06 Nov 2010 11:44:11 GMT Subject: [PATCH 1/8] wrapper: move xmmap() to sha1_file.c Message-ID: <20101106114411.GA27641@burratino> In-Reply-To: <20101106113905.GA27405@burratino> wrapper.o depends on sha1_file.o for a number of reasons. One is release_pack_memory(). xmmap function calls mmap, discarding unused pack windows when necessary to relieve memory pressure. Simple git programs using wrapper.o as a friendly libc do not need this functionality. So move xmmap to sha1_file.o, where release_pack_memory() is. Signed-off-by: Jonathan Nieder --- sha1_file.c | 15 +++++++++++++++ wrapper.c | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 0cd9435..8e299ae 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -576,6 +576,21 @@ void release_pack_memory(size_t need, int fd) ; /* nothing */ } +void *xmmap(void *start, size_t length, + int prot, int flags, int fd, off_t offset) +{ + void *ret = mmap(start, length, prot, flags, fd, offset); + if (ret == MAP_FAILED) { + if (!length) + return NULL; + release_pack_memory(length, fd); + ret = mmap(start, length, prot, flags, fd, offset); + if (ret == MAP_FAILED) + die_errno("Out of memory? mmap failed"); + } + return ret; +} + void close_pack_windows(struct packed_git *p) { while (p->windows) { diff --git a/wrapper.c b/wrapper.c index fd8ead3..3195ef3 100644 --- a/wrapper.c +++ b/wrapper.c @@ -108,21 +108,6 @@ void *xcalloc(size_t nmemb, size_t size) return ret; } -void *xmmap(void *start, size_t length, - int prot, int flags, int fd, off_t offset) -{ - void *ret = mmap(start, length, prot, flags, fd, offset); - if (ret == MAP_FAILED) { - if (!length) - return NULL; - release_pack_memory(length, fd); - ret = mmap(start, length, prot, flags, fd, offset); - if (ret == MAP_FAILED) - die_errno("Out of memory? mmap failed"); - } - return ret; -} - /* * xread() is the same a read(), but it automatically restarts read() * operations with a recoverable error (EAGAIN and EINTR). xread() -- 1.7.2.3.557.gab647.dirty