livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix vertual memory overflow in logs (FS:TJ- Cherry-pick to try improve FIRE-36494)

master
Andrey Kleshchev 2026-07-04 00:01:07 +03:00 committed by Hecklezz
parent 030b7660c2
commit fc6f4ee6a9
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llcommon/llsys.cpp
View File

@ -964,7 +964,7 @@ LLSD LLMemoryInfo::loadStatsMap()
state.dwLength = sizeof(state);
GlobalMemoryStatusEx(&state);
DWORDLONG div = 1024;
static constexpr DWORDLONG div = 1024;
stats.add("Percent Memory use", state.dwMemoryLoad/div);
// <FS:Ansariel> Ugly, but prevent overflow
@ -972,14 +972,18 @@ LLSD LLMemoryInfo::loadStatsMap()
//stats.add("Avail Physical KB", state.ullAvailPhys/div);
//stats.add("Total page KB", state.ullTotalPageFile/div);
//stats.add("Avail page KB", state.ullAvailPageFile/div);
//stats.add("Total Virtual KB", state.ullTotalVirtual/div);
//stats.add("Avail Virtual KB", state.ullAvailVirtual/div);
//static constexpr DWORDLONG mb_div = 1024 * 1024;
//stats.add("Total Virtual MB", state.ullTotalVirtual/mb_div); // ~134 million MB
//stats.add("Avail Virtual MB", state.ullAvailVirtual/mb_div);
stats.add("Total Physical KB", llclamp(state.ullTotalPhys/div, U64(0), U64(S32_MAX)));
stats.add("Avail Physical KB", llclamp(state.ullAvailPhys/div, U64(0), U64(S32_MAX)));
stats.add("Total page KB", llclamp(state.ullTotalPageFile/div, U64(0), U64(S32_MAX)));
stats.add("Avail page KB", llclamp(state.ullAvailPageFile/div, U64(0), U64(S32_MAX)));
stats.add("Total Virtual KB", llclamp(state.ullTotalVirtual/div, U64(0), U64(S32_MAX)));
stats.add("Avail Virtual KB", llclamp(state.ullAvailVirtual/div, U64(0), U64(S32_MAX)));
static constexpr DWORDLONG mb_div = 1024 * 1024;
stats.add("Total Virtual MB", llclamp(state.ullTotalVirtual / mb_div, U64(0), U64(S32_MAX)));
stats.add("Avail Virtual MB", llclamp(state.ullAvailVirtual / mb_div, U64(0), U64(S32_MAX)));
// </FS:Ansariel>
// SL-12122 - Call to GetPerformanceInfo() was removed here. Took