Skip to content
Snippets Groups Projects
Commit 5ee90d78 authored by Xiaohong Bao's avatar Xiaohong Bao
Browse files

fix a merge error

parent 83e48f4a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/llcommon/llmemory.cpp
+ 4
− 1
View file @ 5ee90d78
...@@ -110,7 +110,10 @@ void LLMemory::updateMemoryInfo() ...@@ -110,7 +110,10 @@ void LLMemory::updateMemoryInfo()
sAllocatedMemInKB = (U32)(counters.WorkingSetSize / 1024) ; sAllocatedMemInKB = (U32)(counters.WorkingSetSize / 1024) ;
sAllocatedPageSizeInKB = (U32)(counters.PagefileUsage / 1024) ; sAllocatedPageSizeInKB = (U32)(counters.PagefileUsage / 1024) ;
sMaxPhysicalMemInKB = llmin(LLMemoryInfo::getAvailableMemoryKB() + sAllocatedMemInKB, sMaxHeapSizeInKB);
U32 avail_phys, avail_virtual;
LLMemoryInfo::getAvailableMemoryKB(avail_phys, avail_virtual) ;
sMaxPhysicalMemInKB = llmin(avail_phys + sAllocatedMemInKB, sMaxHeapSizeInKB);
if(sMaxPhysicalMemInKB > sAllocatedMemInKB) if(sMaxPhysicalMemInKB > sAllocatedMemInKB)
{ {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment