godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25494 from RandomShaper/fix-21677 

Let memory stat functions return uint64_t
This commit is contained in:
Rémi Verschelde 2019-01-31 10:33:18 +01:00 committed by GitHub
parent 6225b17d5f 496d8f19fc
commit 463123a661
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/bind/core_bind.cpp
View File

@ -592,17 +592,17 @@ struct Time {
};
*/
int _OS::get_static_memory_usage() const {
uint64_t _OS::get_static_memory_usage() const {
return OS::get_singleton()->get_static_memory_usage();
}
int _OS::get_static_memory_peak_usage() const {
uint64_t _OS::get_static_memory_peak_usage() const {
return OS::get_singleton()->get_static_memory_peak_usage();
}
int _OS::get_dynamic_memory_usage() const {
uint64_t _OS::get_dynamic_memory_usage() const {
return OS::get_singleton()->get_dynamic_memory_usage();
}

6
core/bind/core_bind.h
View File

@ -283,9 +283,9 @@ public:
uint64_t get_system_time_secs() const;
uint64_t get_system_time_msecs() const;
int get_static_memory_usage() const;
int get_static_memory_peak_usage() const;
int get_dynamic_memory_usage() const;
uint64_t get_static_memory_usage() const;
uint64_t get_static_memory_peak_usage() const;
uint64_t get_dynamic_memory_usage() const;
void delay_usec(uint32_t p_usec) const;
void delay_msec(uint32_t p_msec) const;

8
core/os/os.cpp
View File

@ -393,16 +393,16 @@ Error OS::dialog_input_text(String p_title, String p_description, String p_parti
return OK;
};
int OS::get_static_memory_usage() const {
uint64_t OS::get_static_memory_usage() const {
return Memory::get_mem_usage();
}
int OS::get_dynamic_memory_usage() const {
uint64_t OS::get_dynamic_memory_usage() const {
return MemoryPool::total_memory;
}
int OS::get_static_memory_peak_usage() const {
uint64_t OS::get_static_memory_peak_usage() const {
return Memory::get_mem_max_usage();
}
@ -418,7 +418,7 @@ bool OS::has_touchscreen_ui_hint() const {
return Input::get_singleton() && Input::get_singleton()->is_emulating_touch_from_mouse();
}
int OS::get_free_static_memory() const {
uint64_t OS::get_free_static_memory() const {
return Memory::get_mem_available();
}

8
core/os/os.h
View File

@ -382,10 +382,10 @@ public:
virtual void print_resources_in_use(bool p_short = false);
virtual void print_all_resources(String p_to_file = "");
virtual int get_static_memory_usage() const;
virtual int get_static_memory_peak_usage() const;
virtual int get_dynamic_memory_usage() const;
virtual int get_free_static_memory() const;
virtual uint64_t get_static_memory_usage() const;
virtual uint64_t get_static_memory_peak_usage() const;
virtual uint64_t get_dynamic_memory_usage() const;
virtual uint64_t get_free_static_memory() const;
RenderThreadMode get_render_thread_mode() const { return _render_thread_mode; }