summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-07 18:25:37 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-07 18:26:38 -0300
commit2ab83e1abbf5ee6d00e16056a9e9394114026f28 (patch)
tree7efbb375cc4d00d8e8589fcf1b6a1303bec5df2d /main
parent2a38a5eaa844043b846e03d6655f84caf8a31e74 (diff)
Memory pool vectors (DVector) have been enormously simplified in code, and renamed to PoolVector
Diffstat (limited to 'main')
-rw-r--r--main/performance.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/main/performance.cpp b/main/performance.cpp
index 637ff2b079..2ca73c6d4b 100644
--- a/main/performance.cpp
+++ b/main/performance.cpp
@@ -122,9 +122,9 @@ float Performance::get_monitor(Monitor p_monitor) const {
case TIME_PROCESS: return _process_time;
case TIME_FIXED_PROCESS: return _fixed_process_time;
case MEMORY_STATIC: return Memory::get_mem_usage();
- case MEMORY_DYNAMIC: return Memory::get_dynamic_mem_usage();
- case MEMORY_STATIC_MAX: return Memory::get_mem_max_usage();
- case MEMORY_DYNAMIC_MAX: return Memory::get_dynamic_mem_available();
+ case MEMORY_DYNAMIC: return MemoryPool::total_memory;
+ case MEMORY_STATIC_MAX: return MemoryPool::max_memory;
+ case MEMORY_DYNAMIC_MAX: return 0;
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();