mirror of
https://github.com/systemd/systemd.git
synced 2025-01-13 17:18:18 +03:00
mempool: rework mempool_cleanup() to only release freed tiles
This substantially reworks mempool_cleanup() so that it releases pools with all freed tiles only, but keeps all pools with still-allocated tiles around. This is more correct, as the previous implementation just released all pools regardless if anything was still used or not. This would make valgrind shut up but would just hide memory leaks altogether. Moreover if called during regular runtime of a program would result in bad memory accesses all over. Hence, let's add a proper implementation and only trim pools we really know are empty. This way we can safely call these functions later, when under memory pressure, at any time.
This commit is contained in:
parent
4392b983b8
commit
a2b052b29f
@ -274,7 +274,7 @@ static _used_ const struct hashmap_type_info hashmap_type_info[_HASHMAP_TYPE_MAX
|
||||
},
|
||||
};
|
||||
|
||||
void hashmap_cleanup_pools(void) {
|
||||
void hashmap_trim_pools(void) {
|
||||
int r;
|
||||
|
||||
/* The pool is only allocated by the main thread, but the memory can be passed to other
|
||||
@ -291,8 +291,8 @@ void hashmap_cleanup_pools(void) {
|
||||
if (r != 1)
|
||||
return (void) log_debug("Not cleaning up memory pools, running in multi-threaded process.");
|
||||
|
||||
mempool_drop(&hashmap_pool);
|
||||
mempool_drop(&ordered_hashmap_pool);
|
||||
mempool_trim(&hashmap_pool);
|
||||
mempool_trim(&ordered_hashmap_pool);
|
||||
}
|
||||
|
||||
#if VALGRIND
|
||||
|
@ -444,4 +444,4 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(IteratedCache*, iterated_cache_free);
|
||||
|
||||
#define _cleanup_iterated_cache_free_ _cleanup_(iterated_cache_freep)
|
||||
|
||||
void hashmap_cleanup_pools(void);
|
||||
void hashmap_trim_pools(void);
|
||||
|
@ -3,6 +3,7 @@
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "format-util.h"
|
||||
#include "macro.h"
|
||||
#include "memory-util.h"
|
||||
#include "mempool.h"
|
||||
@ -82,12 +83,91 @@ void* mempool_free_tile(struct mempool *mp, void *p) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void mempool_drop(struct mempool *mp) {
|
||||
struct pool *p = mp->first_pool;
|
||||
while (p) {
|
||||
struct pool *n;
|
||||
n = p->next;
|
||||
free(p);
|
||||
p = n;
|
||||
static bool pool_contains(struct mempool *mp, struct pool *p, void *ptr) {
|
||||
size_t off;
|
||||
void *a;
|
||||
|
||||
assert(mp);
|
||||
assert(p);
|
||||
|
||||
if (!ptr)
|
||||
return false;
|
||||
|
||||
a = pool_ptr(p);
|
||||
if ((uint8_t*) ptr < (uint8_t*) a)
|
||||
return false;
|
||||
|
||||
off = (uint8_t*) ptr - (uint8_t*) a;
|
||||
assert(off % mp->tile_size == 0);
|
||||
|
||||
return off < mp->tile_size * p->n_tiles;
|
||||
}
|
||||
|
||||
static bool pool_is_unused(struct mempool *mp, struct pool *p) {
|
||||
assert(mp);
|
||||
assert(p);
|
||||
|
||||
if (p->n_used == 0)
|
||||
return true;
|
||||
|
||||
/* Check if all tiles in this specific pool are in the freelist. */
|
||||
size_t n = 0;
|
||||
void *i = mp->freelist;
|
||||
while (i) {
|
||||
if (pool_contains(mp, p, i))
|
||||
n++;
|
||||
|
||||
i = *(void**) i;
|
||||
}
|
||||
|
||||
assert(n <= p->n_used);
|
||||
|
||||
return n == p->n_used;
|
||||
}
|
||||
|
||||
static void pool_unlink(struct mempool *mp, struct pool *p) {
|
||||
size_t m = 0;
|
||||
|
||||
assert(mp);
|
||||
assert(p);
|
||||
|
||||
if (p->n_used == 0)
|
||||
return;
|
||||
|
||||
void **i = &mp->freelist;
|
||||
while (*i) {
|
||||
void *d = *i;
|
||||
|
||||
if (pool_contains(mp, p, d)) {
|
||||
*i = *(void**) d;
|
||||
m++;
|
||||
|
||||
if (m == p->n_used)
|
||||
break;
|
||||
} else
|
||||
i = (void**) d;
|
||||
}
|
||||
}
|
||||
|
||||
void mempool_trim(struct mempool *mp) {
|
||||
size_t trimmed = 0, left = 0;
|
||||
|
||||
assert(mp);
|
||||
|
||||
struct pool **p = &mp->first_pool;
|
||||
while (*p) {
|
||||
struct pool *d = *p;
|
||||
|
||||
if (pool_is_unused(mp, d)) {
|
||||
trimmed += d->n_tiles * mp->tile_size;
|
||||
pool_unlink(mp, d);
|
||||
*p = d->next;
|
||||
free(d);
|
||||
} else {
|
||||
left += d->n_tiles * mp->tile_size;
|
||||
p = &d->next;
|
||||
}
|
||||
}
|
||||
|
||||
log_debug("Trimmed %s from memory pool %p. (%s left)", FORMAT_BYTES(trimmed), mp, FORMAT_BYTES(left));
|
||||
}
|
||||
|
@ -25,4 +25,4 @@ static struct mempool pool_name = { \
|
||||
|
||||
__attribute__((weak)) bool mempool_enabled(void);
|
||||
|
||||
void mempool_drop(struct mempool *mp);
|
||||
void mempool_trim(struct mempool *mp);
|
||||
|
Loading…
Reference in New Issue
Block a user