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

[to #53001621] fix PlJit and PlDebug memory leak

Browse Source
This commit is contained in:
0xacc
2024-01-05 13:12:50 +00:00
committed by ob-robot
parent 00632ae17c
commit 363c768e4b
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/objit/include/objit/ob_llvm_helper.h
View File

@ -544,7 +544,7 @@ class ObDWARFHelper
public:
ObDWARFHelper(ObIAllocator &allocator, char* debug_buf, int64_t debug_len)
: Allocator(allocator), DebugBuf(debug_buf), DebugLen(debug_len), Context(nullptr) {}
~ObDWARFHelper() {}
~ObDWARFHelper();
int init();

12
src/objit/src/core/jit_context.h
View File

@ -54,27 +54,17 @@ public:
std::unique_ptr<legacy::FunctionPassManager> TheFPM;
};
class StringMemoryBuffer : public llvm::MemoryBuffer
{
public:
StringMemoryBuffer(const char *debug_buffer, int64_t debug_length) {
init(debug_buffer, debug_buffer + debug_length, false);
}
BufferKind getBufferKind() const override { return MemoryBuffer_Malloc; }
};
class ObDWARFContext
{
public:
ObDWARFContext(char* DebugBuf, int64_t DebugLen)
: MemoryBuf(DebugBuf, DebugLen), MemoryRef(MemoryBuf) {}
: MemoryRef(StringRef(DebugBuf, DebugLen), "") {}
~ObDWARFContext() {}
int init();
public:
StringMemoryBuffer MemoryBuf;
llvm::MemoryBufferRef MemoryRef;
std::unique_ptr<llvm::object::Binary> Bin;

28
src/objit/src/ob_llvm_helper.cpp
View File

@ -1998,6 +1998,7 @@ int ObLLVMHelper::check_insert_point(bool &is_valid)
int ObDWARFHelper::init()
{
int ret = OB_SUCCESS;
OB_LLVM_MALLOC_GUARD(GET_PL_MOD_STRING(pl::OB_PL_DEBUG_MOD));
std::string s;
llvm::raw_string_ostream Out(s);
if (nullptr == (Context = OB_NEWx(core::ObDWARFContext, (&Allocator), DebugBuf, DebugLen))) {
@ -2019,7 +2020,12 @@ int ObDWARFHelper::init()
DumpOpts.ShowForm = true;
DumpOpts.SummarizeTypes = true;
DumpOpts.Verbose = true;
Context->Context->dump(Out, DumpOpts);
{
// dump uses static memory, record as SYS tenant
lib::ObMallocHookAttrGuard malloc_guard(
ObMemAttr(OB_SYS_TENANT_ID, GET_PL_MOD_STRING(pl::OB_PL_DEBUG_MOD)));
Context->Context->dump(Out, DumpOpts);
}
Out.flush();
LOG_INFO("success to init ObDWARFHelper!", K(ret), K(Out.str().c_str()));
}
@ -2031,8 +2037,7 @@ int ObDWARFHelper::dump(char* DebugBuf, int64_t DebugLen)
int ret = OB_SUCCESS;
std::string s;
llvm::raw_string_ostream Out(s);
core::StringMemoryBuffer MemoryBuf(DebugBuf, DebugLen);
MemoryBufferRef MemoryRef(MemoryBuf);
MemoryBufferRef MemoryRef(ObStringRef(DebugBuf, DebugLen), "");
auto BinOrErr = llvm::object::createBinary(MemoryRef);
if (!BinOrErr) {
ret = OB_ERR_UNEXPECTED;
@ -2050,7 +2055,12 @@ int ObDWARFHelper::dump(char* DebugBuf, int64_t DebugLen)
DumpOpts.SummarizeTypes = true;
DumpOpts.Verbose = true;
Context->verify(Out);
Context->dump(Out, DumpOpts);
{
// dump uses static memory, record as SYS tenant
lib::ObMallocHookAttrGuard malloc_guard(
ObMemAttr(OB_SYS_TENANT_ID, GET_PL_MOD_STRING(pl::OB_PL_DEBUG_MOD)));
Context->dump(Out, DumpOpts);
}
Out.flush();
}
}
@ -2207,5 +2217,13 @@ int ObDWARFHelper::find_function_from_pc(uint64_t pc, ObDIEAddress &func)
return ret;
}
ObDWARFHelper::~ObDWARFHelper() {
if (nullptr != Context) {
Context->~ObDWARFContext();
Allocator.free(Context);
Context = nullptr;
}
}
}
} // namespace jit
} // namespace oceanbase