hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix memorydump hang

Browse Source
This commit is contained in:
obdev
2022-11-02 15:41:01 +00:00
committed by wangzelin.wzl
parent fc00df48dd
commit c118ed1643
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
deps/oblib/src/lib/alloc/memory_dump.cpp vendored
View File

@ -352,10 +352,11 @@ int label_stat(AChunk *chunk, ABlock *block, AObject *object,
} else {
hold = align_up2(chunk->alloc_bytes_ + ACHUNK_HEADER_SIZE, get_page_size());
}
void *label = &object->label_[0];
void *end = memchr(label, '\0', sizeof(object->label_));
int len = end ? (char*)end - (char*)label : sizeof(object->label_);
ObString str(len, (char*)label);
char label[AOBJECT_LABEL_SIZE + 1];
STRNCPY(label, object->label_, sizeof(label));
label[sizeof(label) - 1] = '\0';
int len = strlen(label);
ObString str(len, label);
LabelItem *litem = nullptr;
LabelInfoItem *linfoitem = lmap.get(str);
if (NULL != linfoitem) {

2
deps/oblib/src/lib/alloc/memory_dump.h vendored
View File

@ -102,7 +102,7 @@ struct LabelInfoItem
void *block_;
};
typedef common::hash::ObHashMap<ObString, LabelInfoItem> LabelMap;
typedef common::hash::ObHashMap<ObString, LabelInfoItem, hash::NoPthreadDefendMode> LabelMap;
using lib::AChunk;
using lib::ABlock;