diff options
| author | Howard Stearns <aech@lindenlab.com> | 2022-05-27 20:29:56 +0000 |
|---|---|---|
| committer | Howard Stearns <aech@lindenlab.com> | 2022-05-27 20:29:56 +0000 |
| commit | 266568bf6f0afc347abdbef4e79ba8c96f408210 (patch) | |
| tree | 0330ef4560a6cc665761b7b6c5ab1d8c612ae4a9 /indra/llcommon | |
| parent | 4cfa59d3f1b856f62ab18543b1dbefbc574fb218 (diff) | |
| parent | f55c1ff40562a6f46a5508c7308d335a9aadb68f (diff) | |
Merged in SL-15937 (pull request #991)
SL-15937 - adjust memory limit / cache code
Approved-by: Andrey Lihatskiy
Approved-by: Vir Linden
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llmemory.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp index 849867586a..d6ae1284d3 100644 --- a/indra/llcommon/llmemory.cpp +++ b/indra/llcommon/llmemory.cpp @@ -212,11 +212,9 @@ U64 LLMemory::getCurrentRSS() mach_msg_type_number_t basicInfoCount = MACH_TASK_BASIC_INFO_COUNT; if (task_info(mach_task_self(), MACH_TASK_BASIC_INFO, (task_info_t)&basicInfo, &basicInfoCount) == KERN_SUCCESS) { -// residentSize = basicInfo.resident_size; - // Although this method is defined to return the "resident set size," - // in fact what callers want from it is the total virtual memory - // consumed by the application. - residentSize = basicInfo.virtual_size; + residentSize = basicInfo.resident_size; + // 64-bit macos apps allocate 32 GB or more at startup, and this is reflected in virtual_size. + // basicInfo.virtual_size is not what we want. } else { |