summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-04-12 11:45:36 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2017-04-28 08:04:59 +0200
commit1ce56a21a040ffdc9415d1d42174e916341d2be3 (patch)
treecd00f3beaa18d51613800fe79562812253795700 /lib
parentbd3b279d0d5bc3aa8593066d302ca025aed81de0 (diff)
downloadbarebox-1ce56a21a040ffdc9415d1d42174e916341d2be3.tar.gz
barebox-1ce56a21a040ffdc9415d1d42174e916341d2be3.tar.xz
xfuncs: Be more informative when out of memory panic occurs
When one of the xfuncs panics we can be a bit more informative. We can at least print the amount of bytes we wanted to allocate and how much memory we have left. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/xfuncs.c32
1 files changed, 24 insertions, 8 deletions
diff --git a/lib/xfuncs.c b/lib/xfuncs.c
index 1dc2ea92d8..1bcaa5e10e 100644
--- a/lib/xfuncs.c
+++ b/lib/xfuncs.c
@@ -18,18 +18,30 @@
* GNU General Public License for more details.
*
*/
+#define pr_fmt(fmt) "xfuncs: " fmt
#include <common.h>
#include <malloc.h>
#include <module.h>
#include <wchar.h>
+static void __noreturn enomem_panic(size_t size)
+{
+ pr_emerg("out of memory\n");
+ if (size)
+ pr_emerg("Unable to allocate %d bytes\n", size);
+
+ malloc_stats();
+
+ panic("out of memory");
+}
+
void *xmalloc(size_t size)
{
void *p = NULL;
if (!(p = malloc(size)))
- panic("ERROR: out of memory\n");
+ enomem_panic(size);
return p;
}
@@ -40,7 +52,7 @@ void *xrealloc(void *ptr, size_t size)
void *p = NULL;
if (!(p = realloc(ptr, size)))
- panic("ERROR: out of memory\n");
+ enomem_panic(size);
return p;
}
@@ -63,7 +75,7 @@ char *xstrdup(const char *s)
p = strdup(s);
if (!p)
- panic("ERROR: out of memory\n");
+ enomem_panic(strlen(s) + 1);
return p;
}
@@ -95,7 +107,8 @@ void* xmemalign(size_t alignment, size_t bytes)
{
void *p = memalign(alignment, bytes);
if (!p)
- panic("ERROR: out of memory\n");
+ enomem_panic(bytes);
+
return p;
}
EXPORT_SYMBOL(xmemalign);
@@ -116,7 +129,7 @@ char *xvasprintf(const char *fmt, va_list ap)
p = bvasprintf(fmt, ap);
if (!p)
- panic("ERROR: out of memory\n");
+ enomem_panic(0);
return p;
}
EXPORT_SYMBOL(xvasprintf);
@@ -139,7 +152,8 @@ wchar_t *xstrdup_wchar(const wchar_t *s)
wchar_t *p = strdup_wchar(s);
if (!p)
- panic("ERROR: out of memory\n");
+ enomem_panic((wcslen(s) + 1) * sizeof(wchar_t));
+
return p;
}
EXPORT_SYMBOL(xstrdup_wchar);
@@ -149,7 +163,8 @@ wchar_t *xstrdup_char_to_wchar(const char *s)
wchar_t *p = strdup_char_to_wchar(s);
if (!p)
- panic("ERROR: out of memory\n");
+ enomem_panic((strlen(s) + 1) * sizeof(wchar_t));
+
return p;
}
EXPORT_SYMBOL(xstrdup_char_to_wchar);
@@ -159,7 +174,8 @@ char *xstrdup_wchar_to_char(const wchar_t *s)
char *p = strdup_wchar_to_char(s);
if (!p)
- panic("ERROR: out of memory\n");
+ enomem_panic((wcslen(s) + 1) * sizeof(wchar_t));
+
return p;
}
EXPORT_SYMBOL(xstrdup_wchar_to_char);