gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep pool allocator up to date (even though we aren't enabling it)

Browse Source
This commit is contained in:
John Sully 2019-02-10 19:33:07 -05:00
parent adabbca14b
commit 32d0b3141a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/storage.c
View File

@ -134,6 +134,8 @@ void storage_init(const char *tmpfilePath, size_t cbFileReserve)
{ {
serverAssert(mkdisk == NULL); serverAssert(mkdisk == NULL);
mkdisk = MEMKIND_DEFAULT; mkdisk = MEMKIND_DEFAULT;
pool_initialize(&poolobj, sizeof(robj));
pool_initialize(&poolembstrobj, EMBSTR_ROBJ_SIZE);
} }
else else
{ {
@ -169,9 +171,6 @@ void storage_init(const char *tmpfilePath, size_t cbFileReserve)
cbFileReserve = 1*1024*1024*1024; // 1 GB (enough to be interesting) cbFileReserve = 1*1024*1024*1024; // 1 GB (enough to be interesting)
posix_fallocate64(memkind_fd(mkdisk), 0, cbFileReserve); posix_fallocate64(memkind_fd(mkdisk), 0, cbFileReserve);
pool_initialize(&poolobj, sizeof(robj));
pool_initialize(&poolembstrobj, EMBSTR_ROBJ_SIZE);
pthread_atfork(handle_prefork, handle_postfork_parent, handle_postfork_child); pthread_atfork(handle_prefork, handle_postfork_parent, handle_postfork_child);
} }
} }

5
src/storage.h
View File

@ -17,4 +17,9 @@ void sfree(void*);
void *srealloc(void *pv, size_t cb, enum MALLOC_CLASS mclass); void *srealloc(void *pv, size_t cb, enum MALLOC_CLASS mclass);
size_t salloc_usable_size(void *ptr); size_t salloc_usable_size(void *ptr);
struct redisObject *salloc_objembstr();
void sfree_objembstr(struct redisObject *obj);
struct redisObject *salloc_obj();
void sfree_obj(struct redisObject *obj);
#endif #endif