RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-17 20:45:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: pools: split the OS-based allocator in two

Browse Source 
Now there's one part dealing with the allocation itself and keeping
counters up to date, and another one on top of it to return such an
allocated pointer to the user and update the use count and stats.

This is in anticipation for being able to group cache-related parts.
The release code is still done at once.
This commit is contained in:
Willy Tarreau 2021-04-17 16:57:25 +02:00
parent 207c095098
commit 13843641e5
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/pool.h
View File

@ -48,6 +48,7 @@
/* poison each newly allocated area with this byte if >= 0 */
extern int mem_poison_byte;
void *pool_get_from_os(struct pool_head *pool);
void *pool_alloc_nocache(struct pool_head *pool);
void dump_pools_to_trash();
void dump_pools(void);

38
src/pool.c
View File

@ -119,6 +119,26 @@ struct pool_head *create_pool(char *name, unsigned int size, unsigned int flags)
return pool;
}
/* Tries to allocate an object for the pool <pool> using the system's allocator
* and directly returns it. The pool's allocated counter is checked and updated,
* but no other checks are performed. The pool's lock is not used and is not a
* problem either.
*/
void *pool_get_from_os(struct pool_head *pool)
{
if (!pool->limit || pool->allocated < pool->limit) {
void *ptr = pool_alloc_area(pool->size + POOL_EXTRA);
if (ptr) {
_HA_ATOMIC_INC(&pool->allocated);
return ptr;
}
_HA_ATOMIC_INC(&pool->failed);
}
activity[tid].pool_fail++;
return NULL;
}
#ifdef CONFIG_HAP_POOLS
/* Evicts some of the oldest objects from the local cache, pushing them to the
* global pool.
@ -154,25 +174,13 @@ void pool_evict_from_local_caches()
*/
void *pool_alloc_nocache(struct pool_head *pool)
{
int allocated = pool->allocated;
int limit = pool->limit;
void *ptr = NULL;
if (limit && allocated >= limit) {
activity[tid].pool_fail++;
ptr = pool_get_from_os(pool);
if (!ptr)
return NULL;
}
swrate_add_scaled(&pool->needed_avg, POOL_AVG_SAMPLES, pool->allocated, POOL_AVG_SAMPLES/4);
ptr = pool_alloc_area(pool->size + POOL_EXTRA);
if (!ptr) {
_HA_ATOMIC_INC(&pool->failed);
activity[tid].pool_fail++;
return NULL;
}
_HA_ATOMIC_INC(&pool->allocated);
swrate_add_scaled(&pool->needed_avg, POOL_AVG_SAMPLES, pool->used, POOL_AVG_SAMPLES/4);
_HA_ATOMIC_INC(&pool->used);
#ifdef DEBUG_MEMORY_POOLS