Re: [PATCH] xmalloc: include size in the failure message
Matthieu Moy <Matthieu.Moy@imag.fr> writes:
Show 10 quoted lines
> Out-of-memory errors can either be actual lack of memory, or bugs (like
> code trying to call xmalloc(-1) by mistake). A little more information
> may help tracking bugs reported by users.
>
> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
> ---
> This kind of thing may help for cases like
>
> Subject: Out of memory error during git push
> http://thread.gmane.org/gmane.comp.version-control.git/153988
Unless a single allocation try to grab unreasonably amount of memory, probably a failure from a specific single failure may not help much.
But why not.
Show 13 quoted lines
> wrapper.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/wrapper.c b/wrapper.c
> index afb4f6f..7057cbd 100644
> --- a/wrapper.c
> +++ b/wrapper.c
> @@ -40,7 +40,7 @@ void *xmalloc(size_t size)
> if (!ret && !size)
> ret = malloc(1);
> if (!ret)
> - die("Out of memory, malloc failed");
> + die("Out of memory, malloc failed (tried to allocate %u bytes)", size);Perhaps use %lu format with cast to ulong?
I see (conditional) use of %zu in alloc.c only for a debugging codepath nobody exercises, which does this:
#ifdef NO_C99_FORMAT
#define SZ_FMT "%u"
#else
#define SZ_FMT "%zu"
#endif static void report(const char *name, unsigned int count, size_t size)
{
fprintf(stderr, "%10s: %8u (" SZ_FMT " kB)\n", name, count, size);
}which looks wrong.
-- >8 -- alloc.c: fix formatting size_t to string
Under NO_C99_FORMAT the format and the argument would not match if size_t is not the same size as uint. As the one in sha1_file.c seems to be done in a better way, let's use that one.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
alloc.c | 11 ++---------
cache.h | 8 ++++++++
sha1_file.c | 8 --------
3 files changed, 10 insertions(+), 17 deletions(-)
Show changes to 3 files +10 −17
alloc.c, cache.h, sha1_file.c
diff --git a/alloc.c b/alloc.c
index 6ef6753..5324115 100644
--- a/alloc.c
+++ b/alloc.c
@@ -51,19 +51,12 @@ DEFINE_ALLOCATOR(commit, struct commit)
DEFINE_ALLOCATOR(tag, struct tag)
DEFINE_ALLOCATOR(object, union any_object)
-#ifdef NO_C99_FORMAT
-#define SZ_FMT "%u"
-#else
-#define SZ_FMT "%zu"
-#endif
-
static void report(const char *name, unsigned int count, size_t size)
{
- fprintf(stderr, "%10s: %8u (" SZ_FMT " kB)\n", name, count, size);
+ fprintf(stderr, "%10s: %8u (%" SZ_FMT " kB)\n", name, count,
+ sz_fmt(size));
}
-#undef SZ_FMT
-
#define REPORT(name) \
report(#name, name##_allocs, name##_allocs*sizeof(struct name) >> 10)
diff --git a/cache.h b/cache.h
index 37ef9d8..1cfc5f0 100644
--- a/cache.h
+++ b/cache.h
@@ -1101,4 +1101,12 @@ int split_cmdline(char *cmdline, const char ***argv);
/* builtin/merge.c */
int checkout_fast_forward(const unsigned char *from, const unsigned char *to);
+#ifdef NO_C99_FORMAT
+#define SZ_FMT "lu"
+static inline unsigned long sz_fmt(size_t s) { return (unsigned long)s; }
+#else
+#define SZ_FMT "zu"
+static inline size_t sz_fmt(size_t s) { return s; }
+#endif
+
#endif /* CACHE_H */
diff --git a/sha1_file.c b/sha1_file.c
index 0cd9435..4f392b9 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -25,14 +25,6 @@
#endif
#endif
-#ifdef NO_C99_FORMAT
-#define SZ_FMT "lu"
-static unsigned long sz_fmt(size_t s) { return (unsigned long)s; }
-#else
-#define SZ_FMT "zu"
-static size_t sz_fmt(size_t s) { return s; }
-#endif
-
const unsigned char null_sha1[20];
int safe_create_leading_directories(char *path)
Matthieu Moy