diff options
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llsys.cpp | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index bc38b72004..8ebb45ca66 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -853,8 +853,33 @@ void LLMemoryInfo::updateAvailableMemory() } #elif LL_LINUX - U64 phys = U64(getpagesize()) * U64(get_avphys_pages()); - LLMemory::sAvailPhysicalMemInKB = U64Bytes(phys); + bool found_available = false; + LLFILE* fp = LLFile::fopen(MEMINFO_FILE, LLFILE_MODE("rb")); + if (fp) + { + char buff[2048]; + size_t nbytes = fread(buff, 1, sizeof(buff) - 1, fp); + buff[nbytes] = '\0'; + fclose(fp); + + char* memp = strstr(buff, "MemAvailable:"); + if (memp) + { + unsigned long long mem_avail_kb = 0; + if (sscanf(memp, "MemAvailable: %llu", &mem_avail_kb) == 1) + { + LLMemory::sAvailPhysicalMemInKB = U32Kilobytes(mem_avail_kb); + found_available = true; + } + } + } + + if (!found_available) + { + // Fallback for pre-3.14 kernels or container environments without MemAvailable + U64 phys = U64(getpagesize()) * U64(get_avphys_pages()); + LLMemory::sAvailPhysicalMemInKB = U64Bytes(phys); + } #else //do not know how to collect available memory info for other systems. //leave it blank here for now. |