diff options
| author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2017-07-25 02:29:28 +0200 |
|---|---|---|
| committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2017-08-01 01:50:56 +0200 |
| commit | 3ad68c282ec423080a3e3958b187aaf2e48297c5 (patch) | |
| tree | 20ffecfbbc550804d60191b8c7561d439a9d8c53 /main/performance.cpp | |
| parent | 85088275c5e6db63755e8dfd23d5f53d2d5c96ef (diff) | |
Make memory monitors query the right counters
Diffstat (limited to 'main/performance.cpp')
| -rw-r--r-- | main/performance.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/performance.cpp b/main/performance.cpp index c819e15f71..3d8e21bf33 100644 --- a/main/performance.cpp +++ b/main/performance.cpp @@ -117,8 +117,8 @@ float Performance::get_monitor(Monitor p_monitor) const { case TIME_FIXED_PROCESS: return _fixed_process_time; case MEMORY_STATIC: return Memory::get_mem_usage(); case MEMORY_DYNAMIC: return MemoryPool::total_memory; - case MEMORY_STATIC_MAX: return MemoryPool::max_memory; - case MEMORY_DYNAMIC_MAX: return 0; + case MEMORY_STATIC_MAX: return Memory::get_mem_max_usage(); + case MEMORY_DYNAMIC_MAX: return MemoryPool::max_memory; case MEMORY_MESSAGE_BUFFER_MAX: return MessageQueue::get_singleton()->get_max_buffer_usage(); case OBJECT_COUNT: return ObjectDB::get_object_count(); case OBJECT_RESOURCE_COUNT: return ResourceCache::get_cached_resource_count(); |