mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: pools: declare dummy pool functions to remove some ifdefs

Browse Source 
By having a pair of dummy pool_get_from_cache() and pool_put_to_cache()
we can remove some ugly ifdefs, so let's do this. We've already done it
for the shared cache.
This commit is contained in:
Willy Tarreau 2021-04-19 12:29:16 +02:00
parent b2a853d5f0
commit 096b6cf581
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/haproxy/pool.h
View File

@ -249,6 +249,19 @@ static inline void *pool_get_from_cache(struct pool_head *pool)
return item; return item;
} }
#else /* CONFIG_HAP_POOLS */
/* no cache pools implementation */
static inline void *pool_get_from_cache(struct pool_head *pool)
{
return NULL;
}
static inline void pool_put_to_cache(struct pool_head *pool, void *ptr)
{
pool_free_nocache(pool, ptr);
}
#endif /* CONFIG_HAP_POOLS */ #endif /* CONFIG_HAP_POOLS */
@ -270,10 +283,8 @@ static inline void *__pool_alloc(struct pool_head *pool, unsigned int flags)
return NULL; return NULL;
#endif #endif
#ifdef CONFIG_HAP_POOLS
if (!p) if (!p)
p = pool_get_from_cache(pool); p = pool_get_from_cache(pool);
#endif
if (!p) if (!p)
p = pool_alloc_nocache(pool); p = pool_alloc_nocache(pool);
@ -324,11 +335,7 @@ static inline void pool_free(struct pool_head *pool, void *ptr)
if (unlikely(mem_poison_byte >= 0)) if (unlikely(mem_poison_byte >= 0))
memset(ptr, mem_poison_byte, pool->size); memset(ptr, mem_poison_byte, pool->size);
#ifdef CONFIG_HAP_POOLS
pool_put_to_cache(pool, ptr); pool_put_to_cache(pool, ptr);
#else
pool_free_nocache(pool, ptr);
#endif
} }
} }