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

MEDIUM: memory: Use the new _HA_ATOMIC_* macros.

Browse Source 
Use the new _HA_ATOMIC_* macros and add barriers where needed.
This commit is contained in:
Olivier Houchard 2019-03-08 18:53:35 +01:00 committed by Olivier Houchard
parent d2ee3e7227
commit 20872763dd
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/common/memory.h
View File

@ -229,8 +229,9 @@ static inline void *__pool_get_first(struct pool_head *pool)
__ha_barrier_load(); __ha_barrier_load();
new.free_list = *POOL_LINK(pool, cmp.free_list); new.free_list = *POOL_LINK(pool, cmp.free_list);
} while (__ha_cas_dw((void *)&pool->free_list, (void *)&cmp, (void *)&new) == 0); } while (__ha_cas_dw((void *)&pool->free_list, (void *)&cmp, (void *)&new) == 0);
__ha_barrier_atomic_store();
HA_ATOMIC_ADD(&pool->used, 1); _HA_ATOMIC_ADD(&pool->used, 1);
#ifdef DEBUG_MEMORY_POOLS #ifdef DEBUG_MEMORY_POOLS
/* keep track of where the element was allocated from */ /* keep track of where the element was allocated from */
*POOL_LINK(pool, cmp.free_list) = (void *)pool; *POOL_LINK(pool, cmp.free_list) = (void *)pool;
@ -288,8 +289,9 @@ static inline void __pool_free(struct pool_head *pool, void *ptr)
do { do {
*POOL_LINK(pool, ptr) = (void *)free_list; *POOL_LINK(pool, ptr) = (void *)free_list;
__ha_barrier_store(); __ha_barrier_store();
} while (!HA_ATOMIC_CAS(&pool->free_list, &free_list, ptr)); } while (!_HA_ATOMIC_CAS(&pool->free_list, &free_list, ptr));
HA_ATOMIC_SUB(&pool->used, 1); __ha_barrier_atomic_store();
_HA_ATOMIC_SUB(&pool->used, 1);
} }
/* frees an object to the local cache, possibly pushing oldest objects to the /* frees an object to the local cache, possibly pushing oldest objects to the

26
src/memory.c
View File

@ -159,13 +159,13 @@ void *__pool_refill_alloc(struct pool_head *pool, unsigned int avail)
while (1) { while (1) {
if (limit && allocated >= limit) { if (limit && allocated >= limit) {
HA_ATOMIC_ADD(&pool->allocated, allocated - allocated_orig); _HA_ATOMIC_ADD(&pool->allocated, allocated - allocated_orig);
return NULL; return NULL;
} }
ptr = malloc(size + POOL_EXTRA); ptr = malloc(size + POOL_EXTRA);
if (!ptr) { if (!ptr) {
HA_ATOMIC_ADD(&pool->failed, 1); _HA_ATOMIC_ADD(&pool->failed, 1);
if (failed) if (failed)
return NULL; return NULL;
failed++; failed++;
@ -179,11 +179,12 @@ void *__pool_refill_alloc(struct pool_head *pool, unsigned int avail)
do { do {
*POOL_LINK(pool, ptr) = free_list; *POOL_LINK(pool, ptr) = free_list;
__ha_barrier_store(); __ha_barrier_store();
} while (HA_ATOMIC_CAS(&pool->free_list, &free_list, ptr) == 0); } while (_HA_ATOMIC_CAS(&pool->free_list, &free_list, ptr) == 0);
} }
__ha_barrier_atomic_store();
HA_ATOMIC_ADD(&pool->allocated, allocated - allocated_orig); _HA_ATOMIC_ADD(&pool->allocated, allocated - allocated_orig);
HA_ATOMIC_ADD(&pool->used, 1); _HA_ATOMIC_ADD(&pool->used, 1);
#ifdef DEBUG_MEMORY_POOLS #ifdef DEBUG_MEMORY_POOLS
/* keep track of where the element was allocated from */ /* keep track of where the element was allocated from */
@ -210,7 +211,8 @@ void pool_flush(struct pool_head *pool)
return; return;
do { do {
next = pool->free_list; next = pool->free_list;
} while (!HA_ATOMIC_CAS(&pool->free_list, &next, NULL)); } while (!_HA_ATOMIC_CAS(&pool->free_list, &next, NULL));
__ha_barrier_atomic_store();
while (next) { while (next) {
temp = next; temp = next;
next = *POOL_LINK(pool, temp); next = *POOL_LINK(pool, temp);
@ -218,7 +220,7 @@ void pool_flush(struct pool_head *pool)
free(temp); free(temp);
} }
pool->free_list = next; pool->free_list = next;
HA_ATOMIC_SUB(&pool->allocated, removed); _HA_ATOMIC_SUB(&pool->allocated, removed);
/* here, we should have pool->allocate == pool->used */ /* here, we should have pool->allocate == pool->used */
} }
@ -235,7 +237,7 @@ void pool_gc(struct pool_head *pool_ctx)
int cur_recurse = 0; int cur_recurse = 0;
struct pool_head *entry; struct pool_head *entry;
if (recurse || !HA_ATOMIC_CAS(&recurse, &cur_recurse, 1)) if (recurse || !_HA_ATOMIC_CAS(&recurse, &cur_recurse, 1))
return; return;
list_for_each_entry(entry, &pools, list) { list_for_each_entry(entry, &pools, list) {
@ -253,11 +255,11 @@ void pool_gc(struct pool_head *pool_ctx)
if (__ha_cas_dw(&entry->free_list, &cmp, &new) == 0) if (__ha_cas_dw(&entry->free_list, &cmp, &new) == 0)
continue; continue;
free(cmp.free_list); free(cmp.free_list);
HA_ATOMIC_SUB(&entry->allocated, 1); _HA_ATOMIC_SUB(&entry->allocated, 1);
} }
} }
HA_ATOMIC_STORE(&recurse, 0); _HA_ATOMIC_STORE(&recurse, 0);
} }
/* frees an object to the local cache, possibly pushing oldest objects to the /* frees an object to the local cache, possibly pushing oldest objects to the
@ -386,7 +388,7 @@ void pool_gc(struct pool_head *pool_ctx)
int cur_recurse = 0; int cur_recurse = 0;
struct pool_head *entry; struct pool_head *entry;
if (recurse || !HA_ATOMIC_CAS(&recurse, &cur_recurse, 1)) if (recurse || !_HA_ATOMIC_CAS(&recurse, &cur_recurse, 1))
return; return;
list_for_each_entry(entry, &pools, list) { list_for_each_entry(entry, &pools, list) {
@ -407,7 +409,7 @@ void pool_gc(struct pool_head *pool_ctx)
HA_SPIN_UNLOCK(POOL_LOCK, &entry->lock); HA_SPIN_UNLOCK(POOL_LOCK, &entry->lock);
} }
HA_ATOMIC_STORE(&recurse, 0); _HA_ATOMIC_STORE(&recurse, 0);
} }
#endif #endif