From: Timo Sirainen <tss@iki.fi>
Date: Mon, 22 Sep 2008 18:08:26 +0000 (+0300)
Subject: If memory allocation fails, log how large allocation we were trying to do.
X-Git-Tag: 1.2.alpha2~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b9884cebb11fdcdfd2959afcd35063d608c287b;p=thirdparty%2Fdovecot%2Fcore.git

If memory allocation fails, log how large allocation we were trying to do.

--HG--
branch : HEAD
---

diff --git a/src/lib/mempool-alloconly.c b/src/lib/mempool-alloconly.c
index c973911b86..a0e4c7560f 100644
--- a/src/lib/mempool-alloconly.c
+++ b/src/lib/mempool-alloconly.c
@@ -255,8 +255,10 @@ static void block_alloc(struct alloconly_pool *apool, size_t size)
 #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 --git a/src/lib/mempool-system-clean.c b/src/lib/mempool-system-clean.c
index e786dfd6ad..bd6640733d 100644
--- a/src/lib/mempool-system-clean.c
+++ b/src/lib/mempool-system-clean.c
@@ -105,8 +105,8 @@ static void *pool_system_clean_malloc(pool_t pool ATTR_UNUSED, size_t size)
 	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 --git a/src/lib/mempool-system.c b/src/lib/mempool-system.c
index 9cadb88452..f39ce403f3 100644
--- a/src/lib/mempool-system.c
+++ b/src/lib/mempool-system.c
@@ -79,8 +79,8 @@ static void *pool_system_malloc(pool_t pool ATTR_UNUSED, size_t size)
 	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 pool ATTR_UNUSED, void *mem,
 	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) {