TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 07:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

update

Browse source 
revert console.h to best working version
wrap includes around the TORQUE_DISABLE_MEMORY_MANAGER macro
in torqueConfig.h.in add check for whether we are in release and make sure TORQUE_DISABLE_MEMORY_MANAGER is defined.
This commit is contained in:
marauder2k7 2025-05-10 21:59:05 +01:00
parent cb7dab4052
commit 5cc2abc9ae
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/console/console.h
View file

@ -154,7 +154,7 @@ class ConsoleValue
TORQUE_FORCEINLINE bool hasAllocatedData() const TORQUE_FORCEINLINE bool hasAllocatedData() const
{ {
return (type == ConsoleValueType::cvString || isConsoleType()) && data != NULL; return (isConsoleType() && data != NULL);
} }
const char* getConsoleData() const; const char* getConsoleData() const;
@ -166,6 +166,12 @@ class ConsoleValue
dFree(data); dFree(data);
data = NULL; data = NULL;
} }
else if (type == ConsoleValueType::cvString)
{
if (s != StringTable->EmptyString())
dFree(s);
}
type = ConsoleValueType::cvNULL;
} }
public: public:

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

@ -30,6 +30,8 @@
#include "platform/threads/mutex.h" #include "platform/threads/mutex.h"
#include "core/module.h" #include "core/module.h"
#if !defined(TORQUE_DISABLE_MEMORY_MANAGER)
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#include <dbghelp.h> #include <dbghelp.h>
@ -40,6 +42,8 @@
#include <ctime> #include <ctime>
#include <string> #include <string>
#endif
// If profile paths are enabled, disable profiling of the // If profile paths are enabled, disable profiling of the
// memory manager as that would cause a cyclic dependency // memory manager as that would cause a cyclic dependency
// through the string table's allocation stuff used by the // through the string table's allocation stuff used by the
@ -177,11 +181,11 @@ namespace Memory
#endif #endif
} }
//if (report.find("getDocsLink") != std::string::npos) if (report.find("getDocsLink") != std::string::npos)
//{ {
// //known issue. one off allocation //known issue. one off allocation
// memLog[curRep].skip = true; memLog[curRep].skip = true;
//} }
for (U32 oldRep = start; oldRep < curRep; ++oldRep) for (U32 oldRep = start; oldRep < curRep; ++oldRep)
{ {

4
Tools/CMake/torqueConfig.h.in
View file

@ -56,6 +56,10 @@
/// Define me if you want to disable Torque memory manager. /// Define me if you want to disable Torque memory manager.
#cmakedefine TORQUE_DISABLE_MEMORY_MANAGER #cmakedefine TORQUE_DISABLE_MEMORY_MANAGER
#ifdef TORQUE_RELEASE
#define TORQUE_DISABLE_MEMORY_MANAGER
#endif
/// Define me if you want to disable the virtual mount system. /// Define me if you want to disable the virtual mount system.
#cmakedefine TORQUE_DISABLE_VIRTUAL_MOUNT_SYSTEM #cmakedefine TORQUE_DISABLE_VIRTUAL_MOUNT_SYSTEM