mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: pool: remove the size field from pool_cache_head

Browse Source 
Everywhere we have access to the pool so we don't need to cache a copy
of the pool's size into the pool_cache_head. Let's remove it.
This commit is contained in:
Willy Tarreau 2021-04-17 14:05:10 +02:00
parent 9f3129e583
commit d5140e7c6f
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/pool-t.h
View File

@ -84,7 +84,6 @@
struct pool_cache_head {
struct list list; /* head of objects in this pool */
size_t size; /* size of an object */
unsigned int count; /* number of objects in this pool */
} THREAD_ALIGNED(64);

4
include/haproxy/pool.h
View File

@ -94,7 +94,7 @@ static inline void *__pool_get_from_cache(struct pool_head *pool)
item = LIST_NEXT(&ph->list, typeof(item), by_pool);
ph->count--;
pool_cache_bytes -= ph->size;
pool_cache_bytes -= pool->size;
pool_cache_count--;
LIST_DEL(&item->by_pool);
LIST_DEL(&item->by_lru);
@ -117,7 +117,7 @@ static inline void pool_put_to_cache(struct pool_head *pool, void *ptr)
LIST_ADD(&ti->pool_lru_head, &item->by_lru);
ph->count++;
pool_cache_count++;
pool_cache_bytes += ph->size;
pool_cache_bytes += pool->size;
if (unlikely(pool_cache_bytes > CONFIG_HAP_POOL_CACHE_SIZE))
pool_evict_from_cache();

3
src/pool.c
View File

@ -111,7 +111,6 @@ struct pool_head *create_pool(char *name, unsigned int size, unsigned int flags)
/* update per-thread pool cache if necessary */
for (thr = 0; thr < MAX_THREADS; thr++) {
LIST_INIT(&pool->cache[thr].list);
pool->cache[thr].size = size;
}
#endif
HA_SPIN_INIT(&pool->lock);
@ -141,7 +140,7 @@ void pool_evict_from_cache()
LIST_DEL(&item->by_lru);
ph->count--;
pool_cache_count--;
pool_cache_bytes -= ph->size;
pool_cache_bytes -= pool->size;
__pool_free(pool, item);
} while (pool_cache_bytes > CONFIG_HAP_POOL_CACHE_SIZE * 7 / 8);
}