From 4093f2d0f41dc98afc5c4186b0fe1bbf10fbc926 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Fri, 26 Feb 2016 09:54:55 -0600 Subject: [PATCH] disable the memory manager entirely! - server scripts may load _slightly_ slower at least, visibly, but we don't crash this way --- .../src/shared/ConfigServerDatabase.cpp | 2 +- .../console/ConsoleCommandParserServer.cpp | 28 ------------------- .../src/shared/MemoryManager.cpp | 2 +- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/engine/server/library/serverDatabase/src/shared/ConfigServerDatabase.cpp b/engine/server/library/serverDatabase/src/shared/ConfigServerDatabase.cpp index 2760bb31..a6bb553f 100755 --- a/engine/server/library/serverDatabase/src/shared/ConfigServerDatabase.cpp +++ b/engine/server/library/serverDatabase/src/shared/ConfigServerDatabase.cpp @@ -74,7 +74,7 @@ void ConfigServerDatabase::install(void) KEY_BOOL (enableLoadLocks, true); KEY_INT (databaseReconnectTime, 0); KEY_BOOL (logChunkLoading,false); - KEY_BOOL (useMemoryManagerForOCI,true); + KEY_BOOL (useMemoryManagerForOCI,false); KEY_INT (maxCharactersPerLoadRequest,10); KEY_INT (maxChunksPerLoadRequest,200); KEY_FLOAT (maxLoadStartDelay,300.0f); diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.cpp index c81f8966..247aec16 100755 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserServer.cpp @@ -439,34 +439,6 @@ bool ConsoleCommandParserServer::performParsing (const NetworkId & userId, const } result += Unicode::narrowToWide(pid.getValueString()); } - - //----------------------------------------------------------------- - else if (isAbbrev( argv[0], "memUsage")) - { - char text[256]; - sprintf(text, "Bytes: %lu Allocations: %d\n", MemoryManager::getCurrentNumberOfBytesAllocated(), MemoryManager::getCurrentNumberOfAllocations()); - - result += Unicode::narrowToWide(text); - result += getErrorMessage (argv[0], ERR_SUCCESS); - } - - //----------------------------------------------------------------- - else if (isAbbrev( argv[0], "memoryReport")) - { - MemoryManager::report(); - result += getErrorMessage (argv[0], ERR_SUCCESS); - } - - //----------------------------------------------------------------- - else if (isAbbrev( argv[0], "dumpMemToFile")) - { - std::string fileName(Unicode::wideToNarrow(argv[1])); - std::string leakStr(Unicode::wideToNarrow(argv[2])); - bool leak = (leakStr == "true" || leakStr == "1"); - - MemoryManager::reportToFile(fileName.c_str(), leak); - result += getErrorMessage (argv[0], ERR_SUCCESS); - } //----------------------------------------------------------------- else if (isAbbrev( argv[0], "clock")) diff --git a/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp b/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp index 4dd1138b..f58a1cc5 100755 --- a/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp +++ b/engine/shared/library/sharedMemoryManager/src/shared/MemoryManager.cpp @@ -36,7 +36,7 @@ // the below seems to bare minimum cause the DB process to segfault // too bad, if we weren't using an omnibus mem manager we could potentially maximize usage -#define DISABLE_MEMORY_MANAGER 0 +#define DISABLE_MEMORY_MANAGER 1 //lint -e826 // Suspicious pointer-to-pointer conversion (area too small)