From 2e7ed2a172d3d79f45d4d5e32b465d40206685d7 Mon Sep 17 00:00:00 2001 From: Beq Date: Tue, 16 Jul 2024 01:11:21 +0100 Subject: [PATCH] Add some debug logging for memory tracking Two setting MemoryInfo will enable the logging of updates to the memory stats. TextureMemory will enable the logging of whether low RAM is skewing the bias. --- indra/llcommon/llmemory.cpp | 7 +++++++ indra/newview/llviewertexture.cpp | 2 ++ 2 files changed, 9 insertions(+) diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp index 69c9ba38f1..c296112a4c 100644 --- a/indra/llcommon/llmemory.cpp +++ b/indra/llcommon/llmemory.cpp @@ -191,6 +191,13 @@ void LLMemory::updateMemoryInfo() { sAvailPhysicalMemInKB = U32Kilobytes(0); } + // debug log the memory info + LL_DEBUGS("MemoryInfo") << "Memory Info:" + << "Heap: " << sMaxHeapSizeInKB << "; " // Heap + << "Free: " << sAvailPhysicalMemInKB << "; " // Free + << "FS Use: " << sAllocatedMemInKB << "; " // In use by this instance right now + << "FS Max poss: " << sMaxPhysicalMemInKB << "; " // How much we could have (In use now + free) + << LL_ENDL; // return ; } diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 377153a099..2ed465af87 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -607,6 +607,7 @@ void LLViewerTexture::updateClass() if (isSystemMemoryForTextureLow()) { // System RAM is low -> ramp up discard bias over time to free memory + LL_DEBUGS("TextureMemory") << "System memory is low, use more aggressive discard bias." << LL_ENDL; if (sEvaluationTimer.getElapsedTimeF32() > GPU_MEMORY_CHECK_WAIT_TIME) { sDesiredDiscardBias += llmax(.1f, over_pct); // add at least 10% over-percentage @@ -615,6 +616,7 @@ void LLViewerTexture::updateClass() } else { + LL_DEBUGS("TextureMemory") << "System memory is plentiful, act normally." << LL_ENDL; sDesiredDiscardBias = llmax(sDesiredDiscardBias, 1.f + over_pct); if (sDesiredDiscardBias > 1.f)