From: Junio C Hamano <gitster@pobox•com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail•com>
Cc: git@vger•kernel.org, worley@alum•mit.edu
Subject: Re: [PATCH v3 1/6] wrapper.c: introduce gentle xmalloc(z) that does not die()
Date: Thu, 14 Aug 2014 09:38:40 -0700 [thread overview]
Message-ID: <xmqqegwj2fhr.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1407927454-9268-2-git-send-email-pclouds@gmail.com> ("Nguyễn Thái Ngọc Duy"'s message of "Wed, 13 Aug 2014 17:57:29 +0700")
Nguyễn Thái Ngọc Duy <pclouds@gmail•com> writes:
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail•com>
> ---
I think the basic idea is sound.
"git grep -e _gentle -e _gently -e _gentler" hints me that the new
functions are somewhat misnamed, though.
> git-compat-util.h | 2 ++
> wrapper.c | 73 +++++++++++++++++++++++++++++++++++++++++++------------
> 2 files changed, 59 insertions(+), 16 deletions(-)
>
> diff --git a/git-compat-util.h b/git-compat-util.h
> index f587749..0e541e7 100644
> --- a/git-compat-util.h
> +++ b/git-compat-util.h
> @@ -592,7 +592,9 @@ extern try_to_free_t set_try_to_free_routine(try_to_free_t);
> #endif
> extern char *xstrdup(const char *str);
> extern void *xmalloc(size_t size);
> +extern void *xmalloc_gentle(size_t size);
> extern void *xmallocz(size_t size);
> +extern void *xmallocz_gentle(size_t size);
> extern void *xmemdupz(const void *data, size_t len);
> extern char *xstrndup(const char *str, size_t len);
> extern void *xrealloc(void *ptr, size_t size);
> diff --git a/wrapper.c b/wrapper.c
> index bc1bfb8..ad0992a 100644
> --- a/wrapper.c
> +++ b/wrapper.c
> @@ -9,16 +9,23 @@ static void do_nothing(size_t size)
>
> static void (*try_to_free_routine)(size_t size) = do_nothing;
>
> -static void memory_limit_check(size_t size)
> +static int memory_limit_check(size_t size, int gentle)
> {
> static int limit = -1;
> if (limit == -1) {
> const char *env = getenv("GIT_ALLOC_LIMIT");
> limit = env ? atoi(env) * 1024 : 0;
> }
> - if (limit && size > limit)
> - die("attempting to allocate %"PRIuMAX" over limit %d",
> - (intmax_t)size, limit);
> + if (limit && size > limit) {
> + if (gentle) {
> + error("attempting to allocate %"PRIuMAX" over limit %d",
> + (intmax_t)size, limit);
> + return -1;
> + } else
> + die("attempting to allocate %"PRIuMAX" over limit %d",
> + (intmax_t)size, limit);
> + }
> + return 0;
> }
>
> try_to_free_t set_try_to_free_routine(try_to_free_t routine)
> @@ -42,11 +49,12 @@ char *xstrdup(const char *str)
> return ret;
> }
>
> -void *xmalloc(size_t size)
> +static void *do_xmalloc(size_t size, int gentle)
> {
> void *ret;
>
> - memory_limit_check(size);
> + if (memory_limit_check(size, gentle))
> + return NULL;
> ret = malloc(size);
> if (!ret && !size)
> ret = malloc(1);
> @@ -55,9 +63,16 @@ void *xmalloc(size_t size)
> ret = malloc(size);
> if (!ret && !size)
> ret = malloc(1);
> - if (!ret)
> - die("Out of memory, malloc failed (tried to allocate %lu bytes)",
> - (unsigned long)size);
> + if (!ret) {
> + if (!gentle)
> + die("Out of memory, malloc failed (tried to allocate %lu bytes)",
> + (unsigned long)size);
> + else {
> + error("Out of memory, malloc failed (tried to allocate %lu bytes)",
> + (unsigned long)size);
> + return NULL;
> + }
> + }
> }
> #ifdef XMALLOC_POISON
> memset(ret, 0xA5, size);
> @@ -65,16 +80,42 @@ void *xmalloc(size_t size)
> return ret;
> }
>
> -void *xmallocz(size_t size)
> +void *xmalloc(size_t size)
> +{
> + return do_xmalloc(size, 0);
> +}
> +
> +void *xmalloc_gentle(size_t size)
> +{
> + return do_xmalloc(size, 1);
> +}
> +
> +static void *do_xmallocz(size_t size, int gentle)
> {
> void *ret;
> - if (unsigned_add_overflows(size, 1))
> - die("Data too large to fit into virtual memory space.");
> - ret = xmalloc(size + 1);
> - ((char*)ret)[size] = 0;
> + if (unsigned_add_overflows(size, 1)) {
> + if (gentle) {
> + error("Data too large to fit into virtual memory space.");
> + return NULL;
> + } else
> + die("Data too large to fit into virtual memory space.");
> + }
> + ret = do_xmalloc(size + 1, gentle);
> + if (ret)
> + ((char*)ret)[size] = 0;
> return ret;
> }
>
> +void *xmallocz(size_t size)
> +{
> + return do_xmallocz(size, 0);
> +}
> +
> +void *xmallocz_gentle(size_t size)
> +{
> + return do_xmallocz(size, 1);
> +}
> +
> /*
> * xmemdupz() allocates (len + 1) bytes of memory, duplicates "len" bytes of
> * "data" to the allocated memory, zero terminates the allocated memory,
> @@ -96,7 +137,7 @@ void *xrealloc(void *ptr, size_t size)
> {
> void *ret;
>
> - memory_limit_check(size);
> + memory_limit_check(size, 0);
> ret = realloc(ptr, size);
> if (!ret && !size)
> ret = realloc(ptr, 1);
> @@ -115,7 +156,7 @@ void *xcalloc(size_t nmemb, size_t size)
> {
> void *ret;
>
> - memory_limit_check(size * nmemb);
> + memory_limit_check(size * nmemb, 0);
> ret = calloc(nmemb, size);
> if (!ret && (!nmemb || !size))
> ret = calloc(1, 1);
next prev parent reply other threads:[~2014-08-14 16:38 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-27 16:47 Git chokes on large file Dale R. Worley
2014-05-28 13:32 ` Duy Nguyen
2014-05-28 17:10 ` Junio C Hamano
2014-05-28 18:18 ` Dale R. Worley
2014-05-28 18:15 ` Dale R. Worley
2014-05-28 18:23 ` David Lang
2014-05-28 18:47 ` Dale R. Worley
2014-05-28 19:05 ` David Lang
2014-05-29 19:12 ` Dale R. Worley
2014-05-28 18:54 ` Junio C Hamano
2014-05-28 19:09 ` David Lang
2014-05-29 12:57 ` [PATCH 1/4] wrapper.c: introduce gentle xmallocz that does not die() Nguyễn Thái Ngọc Duy
2014-05-29 12:57 ` [PATCH 2/4] fsck: do not die when not enough memory to examine a pack entry Nguyễn Thái Ngọc Duy
2014-05-29 12:57 ` [PATCH 3/4] diff.c: allow to pass more flags to diff_populate_filespec Nguyễn Thái Ngọc Duy
2014-05-29 12:57 ` [PATCH 4/4] diff: mark any file larger than core.bigfilethreshold binary Nguyễn Thái Ngọc Duy
2014-06-19 12:27 ` Thomas Braun
2014-06-23 12:18 ` Duy Nguyen
2014-06-23 19:21 ` Thomas Braun
2014-06-24 11:45 ` [PATCH v2 1/4] wrapper.c: introduce gentle xmallocz that does not die() Nguyễn Thái Ngọc Duy
2014-06-24 11:45 ` [PATCH v2 2/4] fsck: do not die when not enough memory to examine a pack entry Nguyễn Thái Ngọc Duy
2014-06-26 18:09 ` Junio C Hamano
2014-06-29 0:40 ` Duy Nguyen
2014-06-24 11:45 ` [PATCH v2 3/4] diff.c: allow to pass more flags to diff_populate_filespec Nguyễn Thái Ngọc Duy
2014-06-24 11:45 ` [PATCH v2 4/4] diff: mark any file larger than core.bigfilethreshold binary Nguyễn Thái Ngọc Duy
2014-06-26 17:55 ` Junio C Hamano
2014-06-27 18:56 ` Thomas Braun
2014-06-29 1:11 ` Duy Nguyen
2014-08-13 10:57 ` [PATCH v3 0/6] Large file improvements Nguyễn Thái Ngọc Duy
2014-08-13 10:57 ` [PATCH v3 1/6] wrapper.c: introduce gentle xmalloc(z) that does not die() Nguyễn Thái Ngọc Duy
2014-08-14 16:38 ` Junio C Hamano [this message]
2014-08-13 10:57 ` [PATCH v3 2/6] sha1_file.c: do not die failing to malloc in unpack_compressed_entry Nguyễn Thái Ngọc Duy
2014-08-13 21:13 ` Junio C Hamano
2014-08-13 10:57 ` [PATCH v3 3/6] unpack-objects: continue when fail to malloc due to large objects Nguyễn Thái Ngọc Duy
2014-08-14 16:58 ` Junio C Hamano
2014-08-15 5:24 ` Duy Nguyen
2014-08-13 10:57 ` [PATCH v3 4/6] diff.c: allow to pass more flags to diff_populate_filespec Nguyễn Thái Ngọc Duy
2014-08-13 10:57 ` [PATCH v3 5/6] diff --stat: mark any file larger than core.bigfilethreshold binary Nguyễn Thái Ngọc Duy
2014-08-13 19:32 ` Eric Sunshine
2014-08-13 10:57 ` [PATCH v3 6/6] diff: shortcut for diff'ing two binary SHA-1 objects Nguyễn Thái Ngọc Duy
2014-08-14 17:00 ` Junio C Hamano
2014-08-15 12:11 ` Duy Nguyen
2014-08-14 17:17 ` Junio C Hamano
2014-08-16 3:08 ` [PATCH v4 0/5] Large file improvements Nguyễn Thái Ngọc Duy
2014-08-16 3:08 ` [PATCH v4 1/5] wrapper.c: introduce gentle xmallocz that does not die() Nguyễn Thái Ngọc Duy
2014-08-16 3:08 ` [PATCH v4 2/5] sha1_file.c: do not die failing to malloc in unpack_compressed_entry Nguyễn Thái Ngọc Duy
2014-08-16 3:08 ` [PATCH v4 3/5] diff.c: allow to pass more flags to diff_populate_filespec Nguyễn Thái Ngọc Duy
2014-08-16 3:08 ` [PATCH v4 4/5] diff --stat: mark any file larger than core.bigfilethreshold binary Nguyễn Thái Ngọc Duy
2014-08-16 3:08 ` [PATCH v4 5/5] diff: shortcut for diff'ing two binary SHA-1 objects Nguyễn Thái Ngọc Duy
2014-05-28 15:05 ` Git chokes on large file Thomas Braun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqegwj2fhr.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=pclouds@gmail$(echo .)com \
--cc=worley@alum$(echo .)mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox