mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-02-26 19:52:06 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: pools: get rid of CONFIG_HAP_POOLS

Browse Source 
This one was set in defaults.h only when neither DEBUG_NO_POOLS nor
DEBUG_UAF were set. This was not the most convenient location to look
for it, and it was only used in pool.c to decide on the initial value
of POOL_DBG_NO_CACHE.

Let's just use DEBUG_NO_POOLS || DEBUG_UAF directly on this flag and
get rid of the intermediary condition. This also has the benefit of
removing a double inversion, which is always nice for understanding.
This commit is contained in:
Willy Tarreau 2022-12-08 17:45:08 +01:00
parent a95636682d
commit 4da51bd190
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/haproxy/defaults.h
View File

@ -410,13 +410,6 @@
#define DEFAULT_MAXZLIBMEM 0
#endif
/* Pools are always enabled unless explicitly disabled. When disabled, the
* calls are directly passed to the underlying OS functions.
*/
#if !defined(DEBUG_NO_POOLS) && !defined(DEBUG_UAF)
#define CONFIG_HAP_POOLS
#endif
/* On modern architectures with many threads, a fast memory allocator, and
* local pools, the global pools with their single list can be way slower than
* the standard allocator which already has its own per-thread arenas. In this

2
src/pool.c
View File

@ -52,7 +52,7 @@ uint pool_debugging __read_mostly = /* set of POOL_DBG_* flags */
#ifdef CONFIG_HAP_NO_GLOBAL_POOLS
POOL_DBG_NO_GLOBAL |
#endif
#ifndef CONFIG_HAP_POOLS
#if defined(DEBUG_NO_POOLS) || defined(DEBUG_UAF)
POOL_DBG_NO_CACHE |
#endif
#if defined(DEBUG_POOL_TRACING)