mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly synced 2024-11-21 23:19:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(zmalloc): fix memory accounting of redis types

Browse Source 
Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
Roman Gershman 2022-06-17 06:38:07 +03:00
parent 5505ad00f0
commit 07b92841fe
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/redis/zmalloc_mi.c
View File

@ -15,7 +15,15 @@ __thread mi_heap_t* zmalloc_heap = NULL;
/* Allocate memory or panic */
void* zmalloc(size_t size) {
assert(zmalloc_heap);
return mi_heap_malloc(zmalloc_heap, size);
void* res = mi_heap_malloc(zmalloc_heap, size);
size_t usable = mi_usable_size(res);
// assertion does not hold. Basically mi_good_size is not a good function for
// doing accounting.
// assert(usable == mi_good_size(size));
zmalloc_used_memory_tl += usable;
return res;
}
void* ztrymalloc_usable(size_t size, size_t* usable) {
@ -28,7 +36,12 @@ size_t zmalloc_usable_size(const void* p) {
void zfree(void* ptr) {
size_t usable = mi_usable_size(ptr);
// I wish we can keep this assert but rdb_load creates objects in one thread and
// uses them in another.
// assert(zmalloc_used_memory_tl >= (ssize_t)usable);
zmalloc_used_memory_tl -= usable;
mi_free_size(ptr, usable);
}
@ -51,7 +64,10 @@ void* zmalloc_usable(size_t size, size_t* usable) {
zmalloc_used_memory_tl += g;
assert(zmalloc_heap);
return mi_heap_malloc(zmalloc_heap, g);
void* ptr = mi_heap_malloc(zmalloc_heap, g);
assert(mi_usable_size(ptr) == g);
return ptr;
}
void* zrealloc_usable(void* ptr, size_t size, size_t* usable) {
@ -60,7 +76,10 @@ void* zrealloc_usable(void* ptr, size_t size, size_t* usable) {
*usable = g;
zmalloc_used_memory_tl += (g - prev);
return mi_heap_realloc(zmalloc_heap, ptr, g);
void* res = mi_heap_realloc(zmalloc_heap, ptr, g);
// does not hold, say when prev = 16 and size = 6. mi_malloc does not shrink in this case.
// assert(mi_usable_size(res) == g);
return res;
}
size_t znallocx(size_t size) {
@ -80,7 +99,9 @@ void* ztrymalloc(size_t size) {
void* ztrycalloc(size_t size) {
size_t g = mi_good_size(size);
zmalloc_used_memory_tl += g;
return mi_heap_calloc(zmalloc_heap, 1, size);
void* ptr = mi_heap_calloc(zmalloc_heap, 1, size);
assert(mi_usable_size(ptr) == g);
return ptr;
}
typedef struct Sum_s {

3
src/server/main_service.cc
View File

@ -432,7 +432,8 @@ void Service::DispatchCommand(CmdArgList args, facade::ConnectionContext* cntx)
return;
}
if (etl.gstate() == GlobalState::LOADING || etl.gstate() == GlobalState::SHUTTING_DOWN) {
if ((etl.gstate() == GlobalState::LOADING && (cid->opt_mask() & CO::LOADING) == 0) ||
etl.gstate() == GlobalState::SHUTTING_DOWN) {
string err = StrCat("Can not execute during ", GlobalStateName(etl.gstate()));
(*cntx)->SendError(err);
return;