[OS] Add ThreadWorkPool default size to OS.
Some platforms (*cough* web *cough*) have hard limits on the number of threads that can be spawned. Currently, ThreadPoolWork (mostly used in rendering/physics servers) will spawn as many threads as CPUs available causing exception on machines with high CPU count. This commit adds a new overridable method to OS that returns the default thread pool size (still the CPU count by default), and overrides it for the JavaScript platform so it always allocate only one thread. We can likely improve the whole ThreadPoolWork in the future to always allocate X amount of threads, and assign jobs to them on the fly, but that will require some more architectural changes.
This commit is contained in:
parent
455e027725
commit
4ed1d977fc
3 changed files with 3 additions and 1 deletions
|
@ -298,6 +298,7 @@ public:
|
|||
virtual void set_exit_code(int p_code);
|
||||
|
||||
virtual int get_processor_count() const;
|
||||
virtual int get_default_thread_pool_size() const { return get_processor_count(); }
|
||||
|
||||
virtual String get_unique_id() const;
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ void ThreadWorkPool::_thread_function(void *p_user) {
|
|||
void ThreadWorkPool::init(int p_thread_count) {
|
||||
ERR_FAIL_COND(threads != nullptr);
|
||||
if (p_thread_count < 0) {
|
||||
p_thread_count = OS::get_singleton()->get_processor_count();
|
||||
p_thread_count = OS::get_singleton()->get_default_thread_pool_size();
|
||||
}
|
||||
|
||||
thread_count = p_thread_count;
|
||||
|
|
|
@ -75,6 +75,7 @@ public:
|
|||
Error kill(const ProcessID &p_pid) override;
|
||||
int get_process_id() const override;
|
||||
int get_processor_count() const override;
|
||||
int get_default_thread_pool_size() const override { return 1; }
|
||||
|
||||
String get_executable_path() const override;
|
||||
Error shell_open(String p_uri) override;
|
||||
|
|
Loading…
Reference in a new issue