MINOR: pools: switch DEBUG_DONT_SHARE_POOLS to runtime
This test used to appear at a single location in create_pool() to
enable a check on the pool name or unconditionally merge similarly
sized pools.
This patch introduces POOL_DBG_DONT_MERGE and conditions the test on
this new runtime flag, that is preset according to the aforementioned
debugging option.
diff --git a/include/haproxy/pool-t.h b/include/haproxy/pool-t.h
index 8180bfb..37980c6 100644
--- a/include/haproxy/pool-t.h
+++ b/include/haproxy/pool-t.h
@@ -42,6 +42,7 @@
/* pool debugging flags */
#define POOL_DBG_FAIL_ALLOC 0x00000001 // randomly fail memory allocations
+#define POOL_DBG_DONT_MERGE 0x00000002 // do not merge same-size pools
/* This is the head of a thread-local cache */
diff --git a/src/pool.c b/src/pool.c
index 3c85b08..7f9c3df 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -41,6 +41,9 @@
#ifdef DEBUG_FAIL_ALLOC
POOL_DBG_FAIL_ALLOC |
#endif
+#ifdef DEBUG_DONT_SHARE_POOLS
+ POOL_DBG_DONT_MERGE |
+#endif
0;
static int mem_fail_rate __read_mostly = 0;
@@ -214,11 +217,9 @@
* we look for a shareable one or for the next position
* before which we will insert a new one.
*/
- if ((flags & entry->flags & MEM_F_SHARED)
-#ifdef DEBUG_DONT_SHARE_POOLS
- && strcmp(name, entry->name) == 0
-#endif
- ) {
+ if ((flags & entry->flags & MEM_F_SHARED) &&
+ (!(pool_debugging & POOL_DBG_DONT_MERGE) ||
+ strcmp(name, entry->name) == 0)) {
/* we can share this one */
pool = entry;
DPRINTF(stderr, "Sharing %s with %s\n", name, pool->name);