dovecot-1.2: If memory allocation fails, log how large allocatio...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/53ad035a2d0b
changeset: 8206:53ad035a2d0b
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Sep 22 21:08:26 2008 +0300
description:
If memory allocation fails, log how large allocation we were trying to do.

diffstat:

3 files changed, 10 insertions(+), 8 deletions(-)
src/lib/mempool-alloconly.c    |    6 ++++--
src/lib/mempool-system-clean.c |    4 ++--
src/lib/mempool-system.c       |    8 ++++----

diffs (55 lines):

diff -r b62042ddb79e -r 53ad035a2d0b src/lib/mempool-alloconly.c
--- a/src/lib/mempool-alloconly.c	Mon Sep 22 21:04:38 2008 +0300
+++ b/src/lib/mempool-alloconly.c	Mon Sep 22 21:08:26 2008 +0300
@@ -255,8 +255,10 @@ static void block_alloc(struct alloconly
 #else
 	block = GC_malloc(size);
 #endif
-	if (unlikely(block == NULL))
-		i_fatal_status(FATAL_OUTOFMEM, "block_alloc(): Out of memory");
+	if (unlikely(block == NULL)) {
+		i_fatal_status(FATAL_OUTOFMEM, "block_alloc(%"PRIuSIZE_T
+			       "): Out of memory", size);
+	}
 	block->prev = apool->block;
 	apool->block = block;
 
diff -r b62042ddb79e -r 53ad035a2d0b src/lib/mempool-system-clean.c
--- a/src/lib/mempool-system-clean.c	Mon Sep 22 21:04:38 2008 +0300
+++ b/src/lib/mempool-system-clean.c	Mon Sep 22 21:08:26 2008 +0300
@@ -105,8 +105,8 @@ static void *pool_system_clean_malloc(po
 	mem = calloc(size, 1);
 #endif
 	if (unlikely(mem == NULL)) {
-		i_fatal_status(FATAL_OUTOFMEM,
-			       "pool_system_clean_malloc(): Out of memory");
+		i_fatal_status(FATAL_OUTOFMEM, "pool_system_malloc(%"PRIuSIZE_T
+			       "): Out of memory", size);
 	}
 #if !defined(USE_GC) && !defined(HAVE_MALLOC_USABLE_SIZE)
 	{
diff -r b62042ddb79e -r 53ad035a2d0b src/lib/mempool-system.c
--- a/src/lib/mempool-system.c	Mon Sep 22 21:04:38 2008 +0300
+++ b/src/lib/mempool-system.c	Mon Sep 22 21:08:26 2008 +0300
@@ -79,8 +79,8 @@ static void *pool_system_malloc(pool_t p
 	mem = GC_malloc(size);
 #endif
 	if (unlikely(mem == NULL)) {
-		i_fatal_status(FATAL_OUTOFMEM,
-			       "pool_system_malloc(): Out of memory");
+		i_fatal_status(FATAL_OUTOFMEM, "pool_system_malloc(%"PRIuSIZE_T
+			       "): Out of memory", size);
 	}
 	return mem;
 }
@@ -110,8 +110,8 @@ static void *pool_system_realloc(pool_t 
 	mem = GC_realloc(mem, new_size);
 #endif
 	if (unlikely(mem == NULL)) {
-		i_fatal_status(FATAL_OUTOFMEM,
-			       "pool_system_realloc(): Out of memory");
+		i_fatal_status(FATAL_OUTOFMEM, "pool_system_realloc(%"PRIuSIZE_T
+			       "): Out of memory", new_size);
 	}
 
 	if (old_size < new_size) {