From: Willy Tarreau <w@1wt.eu>
Date: Mon, 19 Apr 2021 10:29:16 +0000 (+0200)
Subject: CLEANUP: pools: declare dummy pool functions to remove some ifdefs
X-Git-Tag: v2.4-dev17~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=096b6cf58155d93ec5fd556d3c4b6911dbffed92;p=thirdparty%2Fhaproxy.git

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

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.
---

diff --git a/include/haproxy/pool.h b/include/haproxy/pool.h
index d9dc527c91..54ec933468 100644
--- a/include/haproxy/pool.h
+++ b/include/haproxy/pool.h
@@ -249,6 +249,19 @@ static inline void *pool_get_from_cache(struct pool_head *pool)
 	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 */
 
@@ -270,10 +283,8 @@ static inline void *__pool_alloc(struct pool_head *pool, unsigned int flags)
 		return NULL;
 #endif
 
-#ifdef CONFIG_HAP_POOLS
 	if (!p)
 		p = pool_get_from_cache(pool);
-#endif
 	if (!p)
 		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))
 			memset(ptr, mem_poison_byte, pool->size);
 
-#ifdef CONFIG_HAP_POOLS
 		pool_put_to_cache(pool, ptr);
-#else
-		pool_free_nocache(pool, ptr);
-#endif
 	}
 }