diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-05-18 15:33:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-05-18 15:33:58 -0400 |
| commit | 013f34ccdd1df275a02e6ca56f8f19b51413b35a (patch) | |
| tree | e9a88852afc69ef7b4642cb9820e1c31772c1c40 /indra/llcommon/llmemory.h | |
| parent | ab3742a2a944ee8535e314ebfad52a980e079a70 (diff) | |
| parent | 4bf1f1d618d61f0cc2ec0dd22cea7d1c5b909b8f (diff) | |
merge latest updates from coyot
Diffstat (limited to 'indra/llcommon/llmemory.h')
| -rw-r--r-- | indra/llcommon/llmemory.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index 5a3c9bd762..c37967e10e 100644 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -334,13 +334,9 @@ inline void ll_memcpy_nonaliased_aligned_16(char* __restrict dst, const char* __ class LL_COMMON_API LLMemory { public: - static void initClass(); - static void cleanupClass(); - static void freeReserve(); // Return the resident set size of the current process, in bytes. // Return value is zero if not known. static U64 getCurrentRSS(); - static U32 getWorkingSetSize(); static void* tryToAlloc(void* address, U32 size); static void initMaxHeapSizeGB(F32Gigabytes max_heap_size, BOOL prevent_heap_failure); static void updateMemoryInfo() ; @@ -351,7 +347,6 @@ public: static U32Kilobytes getMaxMemKB() ; static U32Kilobytes getAllocatedMemKB() ; private: - static char* reserveMem; static U32Kilobytes sAvailPhysicalMemInKB ; static U32Kilobytes sMaxPhysicalMemInKB ; static U32Kilobytes sAllocatedMemInKB; |