CLEANUP: pools: rename pool_*_{from,to}_cache() to *_local_cache()
The functions were rightfully called from/to_cache when the thread-local
cache was considered as the only cache, but this is getting terribly
confusing. Let's call them from/to local_cache to make it clear that
it is not related with the shared cache.
As a side note, since pool_evict_from_cache() used not to work for a
particular pool but for all of them at once, it was renamed to
pool_evict_from_local_caches() (plural form).
diff --git a/include/haproxy/pool.h b/include/haproxy/pool.h
index 0b1d250..c8e5ca5 100644
--- a/include/haproxy/pool.h
+++ b/include/haproxy/pool.h
@@ -77,12 +77,12 @@
extern THREAD_LOCAL size_t pool_cache_bytes; /* total cache size */
extern THREAD_LOCAL size_t pool_cache_count; /* #cache objects */
-void pool_evict_from_cache();
+void pool_evict_from_local_caches();
/* Tries to retrieve an object from the local pool cache corresponding to pool
* <pool>. Returns NULL if none is available.
*/
-static inline void *__pool_get_from_cache(struct pool_head *pool)
+static inline void *pool_get_from_local_cache(struct pool_head *pool)
{
struct pool_cache_item *item;
struct pool_cache_head *ph;
@@ -107,7 +107,7 @@
/* Frees an object to the local cache, possibly pushing oldest objects to the
* global pool.
*/
-static inline void pool_put_to_cache(struct pool_head *pool, void *ptr)
+static inline void pool_put_to_local_cache(struct pool_head *pool, void *ptr)
{
struct pool_cache_item *item = (struct pool_cache_item *)ptr;
struct pool_cache_head *ph = &pool->cache[tid];
@@ -119,7 +119,7 @@
pool_cache_bytes += pool->size;
if (unlikely(pool_cache_bytes > CONFIG_HAP_POOL_CACHE_SIZE))
- pool_evict_from_cache();
+ pool_evict_from_local_caches();
}
#endif // CONFIG_HAP_POOLS
@@ -276,7 +276,7 @@
void *p;
#ifdef CONFIG_HAP_POOLS
- if (likely(p = __pool_get_from_cache(pool)))
+ if (likely(p = pool_get_from_local_cache(pool)))
goto ret;
#endif
@@ -338,7 +338,7 @@
*/
if ((pool_cache_bytes <= CONFIG_HAP_POOL_CACHE_SIZE * 3 / 4 ||
pool->cache[tid].count < 16 + pool_cache_count / 8)) {
- pool_put_to_cache(pool, ptr);
+ pool_put_to_local_cache(pool, ptr);
return;
}
#endif
diff --git a/src/pool.c b/src/pool.c
index 61b7a7a..d1e48fd 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -123,7 +123,7 @@
/* Evicts some of the oldest objects from the local cache, pushing them to the
* global pool.
*/
-void pool_evict_from_cache()
+void pool_evict_from_local_caches()
{
struct pool_cache_item *item;
struct pool_cache_head *ph;