Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-14 22:51:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Now the target fps is customizable for ThreadPool when threading is not enabled.

Browse Source
This commit is contained in:
Relintai 2022-09-17 23:25:47 +02:00
parent 099b05380e
commit 89cba992ba
2 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
core/os/thread_pool.cpp
View File

@ -61,20 +61,33 @@ void ThreadPool::set_thread_fallback_count(const int value) {
_dirty = true; _dirty = true;
} }
float ThreadPool::get_max_work_per_frame_percent() const {
return _max_work_per_frame_percent;
}
void ThreadPool::set_max_work_per_frame_percent(const float value) {
_max_work_per_frame_percent = value;
_dirty = true;
}
float ThreadPool::get_max_time_per_frame() const { float ThreadPool::get_max_time_per_frame() const {
return _max_time_per_frame; return _max_time_per_frame;
} }
void ThreadPool::set_max_time_per_frame(const float value) { void ThreadPool::set_max_time_per_frame(const float value) {
_max_time_per_frame = value; _max_time_per_frame = value;
_dirty = true; }
float ThreadPool::get_max_work_per_frame_percent() const {
return _max_work_per_frame_percent;
}
void ThreadPool::set_max_work_per_frame_percent(const float value) {
_max_work_per_frame_percent = value;
apply_max_work_per_frame_percent();
}
float ThreadPool::get_target_fps() const {
return _target_fps;
}
void ThreadPool::set_target_fps(const float value) {
_target_fps = value;
apply_max_work_per_frame_percent();
}
void ThreadPool::apply_max_work_per_frame_percent() {
_max_time_per_frame = (1.0 / _target_fps) * (_max_work_per_frame_percent / 100.0);
} }
bool ThreadPool::is_working() const { bool ThreadPool::is_working() const {
@ -276,11 +289,11 @@ void ThreadPool::register_core_settings() {
_thread_fallback_count = 1; _thread_fallback_count = 1;
} }
_target_fps = GLOBAL_DEF("thread_pool/target_fps", 60);
//Todo Add help text, as this will only come into play if threading is disabled, or not available //Todo Add help text, as this will only come into play if threading is disabled, or not available
_max_work_per_frame_percent = GLOBAL_DEF("thread_pool/max_work_per_frame_percent", 25); _max_work_per_frame_percent = GLOBAL_DEF("thread_pool/max_work_per_frame_percent", 25);
//Todo this should be recalculated constantly to smooth out performance better apply_max_work_per_frame_percent();
_max_time_per_frame = (1 / 60.0) * (_max_work_per_frame_percent / 100.0);
if (!OS::get_singleton()->can_use_threads()) { if (!OS::get_singleton()->can_use_threads()) {
_use_threads = false; _use_threads = false;
@ -396,13 +409,19 @@ void ThreadPool::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_thread_fallback_count", "value"), &ThreadPool::set_thread_fallback_count); ClassDB::bind_method(D_METHOD("set_thread_fallback_count", "value"), &ThreadPool::set_thread_fallback_count);
ADD_PROPERTY(PropertyInfo(Variant::INT, "thread_fallback_count"), "set_thread_fallback_count", "get_thread_fallback_count"); ADD_PROPERTY(PropertyInfo(Variant::INT, "thread_fallback_count"), "set_thread_fallback_count", "get_thread_fallback_count");
ClassDB::bind_method(D_METHOD("get_max_time_per_frame"), &ThreadPool::get_max_time_per_frame);
ClassDB::bind_method(D_METHOD("set_max_time_per_frame", "value"), &ThreadPool::set_max_time_per_frame);
ADD_PROPERTY(PropertyInfo(Variant::REAL, "max_time_per_frame"), "set_max_time_per_frame", "get_max_time_per_frame");
ClassDB::bind_method(D_METHOD("get_max_work_per_frame_percent"), &ThreadPool::get_max_work_per_frame_percent); ClassDB::bind_method(D_METHOD("get_max_work_per_frame_percent"), &ThreadPool::get_max_work_per_frame_percent);
ClassDB::bind_method(D_METHOD("set_max_work_per_frame_percent", "value"), &ThreadPool::set_max_work_per_frame_percent); ClassDB::bind_method(D_METHOD("set_max_work_per_frame_percent", "value"), &ThreadPool::set_max_work_per_frame_percent);
ADD_PROPERTY(PropertyInfo(Variant::REAL, "max_work_per_frame_percent"), "set_max_work_per_frame_percent", "get_max_work_per_frame_percent"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "max_work_per_frame_percent"), "set_max_work_per_frame_percent", "get_max_work_per_frame_percent");
ClassDB::bind_method(D_METHOD("get_max_time_per_frame"), &ThreadPool::get_max_time_per_frame); ClassDB::bind_method(D_METHOD("get_target_fps"), &ThreadPool::get_target_fps);
ClassDB::bind_method(D_METHOD("set_max_time_per_frame", "value"), &ThreadPool::set_max_time_per_frame); ClassDB::bind_method(D_METHOD("set_target_fps", "value"), &ThreadPool::set_target_fps);
ADD_PROPERTY(PropertyInfo(Variant::REAL, "max_time_per_frame"), "set_max_time_per_frame", "get_max_time_per_frame"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "target_fps"), "set_target_fps", "get_target_fps");
ClassDB::bind_method(D_METHOD("apply_max_work_per_frame_percent"), &ThreadPool::apply_max_work_per_frame_percent);
ClassDB::bind_method(D_METHOD("is_working"), &ThreadPool::is_working); ClassDB::bind_method(D_METHOD("is_working"), &ThreadPool::is_working);
ClassDB::bind_method(D_METHOD("is_working_no_lock"), &ThreadPool::is_working_no_lock); ClassDB::bind_method(D_METHOD("is_working_no_lock"), &ThreadPool::is_working_no_lock);

10
core/os/thread_pool.h
View File

@ -66,11 +66,16 @@ public:
int get_thread_fallback_count() const; int get_thread_fallback_count() const;
void set_thread_fallback_count(const int value); void set_thread_fallback_count(const int value);
float get_max_time_per_frame() const;
void set_max_time_per_frame(const float value);
float get_max_work_per_frame_percent() const; float get_max_work_per_frame_percent() const;
void set_max_work_per_frame_percent(const float value); void set_max_work_per_frame_percent(const float value);
float get_max_time_per_frame() const; float get_target_fps() const;
void set_max_time_per_frame(const float value); void set_target_fps(const float value);
void apply_max_work_per_frame_percent();
bool is_working() const; bool is_working() const;
bool is_working_no_lock() const; bool is_working_no_lock() const;
@ -106,6 +111,7 @@ private:
int _thread_fallback_count; int _thread_fallback_count;
float _max_work_per_frame_percent; float _max_work_per_frame_percent;
float _max_time_per_frame; float _max_time_per_frame;
float _target_fps;
Vector<ThreadPoolContext *> _threads; Vector<ThreadPoolContext *> _threads;