dovecot-2.1: --enable-devel-checks: If DEBUG_SILENT environment ...

dovecot at dovecot.org dovecot at dovecot.org
Wed Apr 11 12:35:24 EEST 2012


details:   http://hg.dovecot.org/dovecot-2.1/rev/7ec8f6515b0d
changeset: 14410:7ec8f6515b0d
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Apr 11 12:35:19 2012 +0300
description:
--enable-devel-checks: If DEBUG_SILENT environment is set, hide "Growing pool" warnings.

diffstat:

 src/lib/data-stack.c         |  2 +-
 src/lib/mempool-alloconly.c  |  3 ++-
 src/master/master-settings.c |  2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r bf5ae73e9475 -r 7ec8f6515b0d src/lib/data-stack.c
--- a/src/lib/data-stack.c	Tue Apr 10 18:05:36 2012 +0300
+++ b/src/lib/data-stack.c	Wed Apr 11 12:35:19 2012 +0300
@@ -371,7 +371,7 @@
 
 		ret = STACK_BLOCK_DATA(current_block);
 #ifdef DEBUG
-		if (warn) {
+		if (warn && getenv("DEBUG_SILENT") == NULL) {
 			/* warn after allocation, so if i_warning() wants to
 			   allocate more memory we don't go to infinite loop */
 			i_warning("Growing data stack with: %"PRIuSIZE_T,
diff -r bf5ae73e9475 -r 7ec8f6515b0d src/lib/mempool-alloconly.c
--- a/src/lib/mempool-alloconly.c	Tue Apr 10 18:05:36 2012 +0300
+++ b/src/lib/mempool-alloconly.c	Wed Apr 11 12:35:19 2012 +0300
@@ -143,7 +143,8 @@
 	new_apool = p_new(&apool.pool, struct alloconly_pool, 1);
 	*new_apool = apool;
 #ifdef DEBUG
-	if (strncmp(name, MEMPOOL_GROWING, strlen(MEMPOOL_GROWING)) == 0) {
+	if (strncmp(name, MEMPOOL_GROWING, strlen(MEMPOOL_GROWING)) == 0 ||
+	    getenv("DEBUG_SILENT") != NULL) {
 		name += strlen(MEMPOOL_GROWING);
 		new_apool->disable_warning = TRUE;
 	}
diff -r bf5ae73e9475 -r 7ec8f6515b0d src/master/master-settings.c
--- a/src/master/master-settings.c	Tue Apr 10 18:05:36 2012 +0300
+++ b/src/master/master-settings.c	Wed Apr 11 12:35:19 2012 +0300
@@ -203,7 +203,7 @@
 #  define ENV_SYSTEMD ""
 #endif
 #ifdef DEBUG
-#  define ENV_GDB " GDB"
+#  define ENV_GDB " GDB DEBUG_SILENT"
 #else
 #  define ENV_GDB ""
 #endif


More information about the dovecot-cvs mailing list