Move use_pool() to mempool.c and rename to mempool_enabled()

The only user is in hashmap.c, but it's a mempool thing.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-10-09 15:53:35 +02:00
parent 6939fb9eb4
commit 7c48ea0280
3 changed files with 17 additions and 16 deletions

View File

@ -6,7 +6,6 @@
#include <string.h>
#include "alloc-util.h"
#include "env-util.h"
#include "fileio.h"
#include "hashmap.h"
#include "macro.h"
@ -767,24 +766,12 @@ static void reset_direct_storage(HashmapBase *h) {
memset(p, DIB_RAW_INIT, sizeof(dib_raw_t) * hi->n_direct_buckets);
}
static bool use_pool(void) {
static int b = -1;
if (!is_main_thread())
return false;
if (b < 0)
b = getenv_bool("SYSTEMD_MEMPOOL") != 0;
return b;
}
static struct HashmapBase *hashmap_base_new(const struct hash_ops *hash_ops, enum HashmapType type HASHMAP_DEBUG_PARAMS) {
HashmapBase *h;
const struct hashmap_type_info *hi = &hashmap_type_info[type];
bool up;
up = use_pool();
up = mempool_enabled();
h = up ? mempool_alloc0_tile(hi->mempool) : malloc0(hi->head_size);
if (!h)

View File

@ -3,8 +3,10 @@
#include <stdint.h>
#include <stdlib.h>
#include "env-util.h"
#include "macro.h"
#include "mempool.h"
#include "process-util.h"
#include "util.h"
struct pool {
@ -70,8 +72,19 @@ void mempool_free_tile(struct mempool *mp, void *p) {
mp->freelist = p;
}
#if VALGRIND
bool mempool_enabled(void) {
static int b = -1;
if (!is_main_thread())
return false;
if (b < 0)
b = getenv_bool("SYSTEMD_MEMPOOL") != 0;
return b;
}
#if VALGRIND
void mempool_drop(struct mempool *mp) {
struct pool *p = mp->first_pool;
while (p) {
@ -81,5 +94,4 @@ void mempool_drop(struct mempool *mp) {
p = n;
}
}
#endif

View File

@ -22,6 +22,8 @@ static struct mempool pool_name = { \
.at_least = alloc_at_least, \
}
bool mempool_enabled(void);
#if VALGRIND
void mempool_drop(struct mempool *mp);
#endif