TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update platformMemory.cpp

Browse source 
stop memleaker from leaking...... yes i see the irony
free was being blocked from running when unitialized
in shutdown reset our allocList allocCount and currentAllocId so the array can be written to again
This commit is contained in:
marauder2k7 2025-05-06 15:17:52 +01:00
parent d93f094cf5
commit 6237703140
1 changed files with 32 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Engine/source/platform/platformMemory.cpp
View file

@ -99,6 +99,8 @@ namespace Memory
std::time_t now = std::time(nullptr);
std::tm* localTime = std::localtime(&now);
std::strftime(gLogFilename, sizeof(gLogFilename), "memlog_%Y-%m-%d_%H-%M-%S.txt", localTime);
//std::atexit(shutdown);
}
void shutdown()
@ -142,12 +144,22 @@ namespace Memory
for (int curStack = 0; curStack < allocList[curRep].backtraceSize; ++curStack)
{
DWORD64 addr = (DWORD64)(allocList[curRep].backtracePtrs[curStack]);
if (SymFromAddr(process, addr, 0, symbol))
{
std::sprintf(stack, " [%d] %s - 0x%0llX\n", curStack, symbol->Name, symbol->Address);
DWORD displacement = 0;
IMAGEHLP_LINE64 line;
std::memset(&line, 0, sizeof(IMAGEHLP_LINE64));
line.SizeOfStruct = sizeof(IMAGEHLP_LINE64);
if (SymFromAddr(process, addr, 0, symbol)) {
if (SymGetLineFromAddr64(process, addr, &displacement, &line)) {
std::sprintf(stack, " [%d] %s - %s:%lu (0x%0llX)\n",
curStack, symbol->Name, line.FileName, line.LineNumber, symbol->Address);
}
else {
std::sprintf(stack, " [%d] %s - ???:??? (0x%0llX)\n",
curStack, symbol->Name, symbol->Address);
}
}
else
{
else {
std::sprintf(stack, " [%d] ??? - 0x%0llX\n", curStack, addr);
}
report += stack;
@ -165,11 +177,11 @@ namespace Memory
#endif
}
if (report.find("getDocsLink") != std::string::npos)
{
//known issue. one off allocation
memLog[curRep].skip = true;
}
//if (report.find("getDocsLink") != std::string::npos)
//{
// //known issue. one off allocation
// memLog[curRep].skip = true;
//}
for (U32 oldRep = start; oldRep < curRep; ++oldRep)
{
@ -201,6 +213,10 @@ namespace Memory
}
std::fclose(log);
std::memset(allocList, 0, sizeof(allocList));
allocCount = 0;
currentAllocId = 0;
initialized = false;
}
@ -247,9 +263,14 @@ namespace Memory
static void free(void* ptr, bool array)
{
if (!ptr || !initialized)
if (!ptr)
return;
if (!initialized)
{
std::free(ptr);
return;
}
for (U32 i = 0; i < allocCount; ++i)
{