mirror of
https://github.com/godotengine/godot.git
synced 2024-11-24 21:22:48 +00:00
Revert "WorkerThreadPool: Enhance lifetime for more flexibility"
This reverts commit 2d1dd41ef5
.
This commit is contained in:
parent
d5d6c730bf
commit
e2fd88ed91
@ -323,8 +323,6 @@ WorkerThreadPool::TaskID WorkerThreadPool::add_native_task(void (*p_func)(void *
|
|||||||
}
|
}
|
||||||
|
|
||||||
WorkerThreadPool::TaskID WorkerThreadPool::_add_task(const Callable &p_callable, void (*p_func)(void *), void *p_userdata, BaseTemplateUserdata *p_template_userdata, bool p_high_priority, const String &p_description) {
|
WorkerThreadPool::TaskID WorkerThreadPool::_add_task(const Callable &p_callable, void (*p_func)(void *), void *p_userdata, BaseTemplateUserdata *p_template_userdata, bool p_high_priority, const String &p_description) {
|
||||||
ERR_FAIL_COND_V_MSG(threads.is_empty(), INVALID_TASK_ID, "Can't add a task because the WorkerThreadPool is either not initialized yet or already terminated.");
|
|
||||||
|
|
||||||
task_mutex.lock();
|
task_mutex.lock();
|
||||||
// Get a free task
|
// Get a free task
|
||||||
Task *task = task_allocator.alloc();
|
Task *task = task_allocator.alloc();
|
||||||
@ -543,7 +541,6 @@ void WorkerThreadPool::notify_yield_over(TaskID p_task_id) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
WorkerThreadPool::GroupID WorkerThreadPool::_add_group_task(const Callable &p_callable, void (*p_func)(void *, uint32_t), void *p_userdata, BaseTemplateUserdata *p_template_userdata, int p_elements, int p_tasks, bool p_high_priority, const String &p_description) {
|
WorkerThreadPool::GroupID WorkerThreadPool::_add_group_task(const Callable &p_callable, void (*p_func)(void *, uint32_t), void *p_userdata, BaseTemplateUserdata *p_template_userdata, int p_elements, int p_tasks, bool p_high_priority, const String &p_description) {
|
||||||
ERR_FAIL_COND_V_MSG(threads.is_empty(), INVALID_TASK_ID, "Can't add a group task because the WorkerThreadPool is either not initialized yet or already terminated.");
|
|
||||||
ERR_FAIL_COND_V(p_elements < 0, INVALID_TASK_ID);
|
ERR_FAIL_COND_V(p_elements < 0, INVALID_TASK_ID);
|
||||||
if (p_tasks < 0) {
|
if (p_tasks < 0) {
|
||||||
p_tasks = MAX(1u, threads.size());
|
p_tasks = MAX(1u, threads.size());
|
||||||
@ -755,5 +752,5 @@ WorkerThreadPool::WorkerThreadPool() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
WorkerThreadPool::~WorkerThreadPool() {
|
WorkerThreadPool::~WorkerThreadPool() {
|
||||||
DEV_ASSERT(threads.size() == 0 && "finish() hasn't been called!");
|
finish();
|
||||||
}
|
}
|
||||||
|
@ -107,6 +107,8 @@ static Time *_time = nullptr;
|
|||||||
static core_bind::Geometry2D *_geometry_2d = nullptr;
|
static core_bind::Geometry2D *_geometry_2d = nullptr;
|
||||||
static core_bind::Geometry3D *_geometry_3d = nullptr;
|
static core_bind::Geometry3D *_geometry_3d = nullptr;
|
||||||
|
|
||||||
|
static WorkerThreadPool *worker_thread_pool = nullptr;
|
||||||
|
|
||||||
extern Mutex _global_mutex;
|
extern Mutex _global_mutex;
|
||||||
|
|
||||||
static GDExtensionManager *gdextension_manager = nullptr;
|
static GDExtensionManager *gdextension_manager = nullptr;
|
||||||
@ -295,6 +297,8 @@ void register_core_types() {
|
|||||||
GDREGISTER_NATIVE_STRUCT(AudioFrame, "float left;float right");
|
GDREGISTER_NATIVE_STRUCT(AudioFrame, "float left;float right");
|
||||||
GDREGISTER_NATIVE_STRUCT(ScriptLanguageExtensionProfilingInfo, "StringName signature;uint64_t call_count;uint64_t total_time;uint64_t self_time");
|
GDREGISTER_NATIVE_STRUCT(ScriptLanguageExtensionProfilingInfo, "StringName signature;uint64_t call_count;uint64_t total_time;uint64_t self_time");
|
||||||
|
|
||||||
|
worker_thread_pool = memnew(WorkerThreadPool);
|
||||||
|
|
||||||
OS::get_singleton()->benchmark_end_measure("Core", "Register Types");
|
OS::get_singleton()->benchmark_end_measure("Core", "Register Types");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -345,7 +349,7 @@ void register_core_singletons() {
|
|||||||
Engine::get_singleton()->add_singleton(Engine::Singleton("Time", Time::get_singleton()));
|
Engine::get_singleton()->add_singleton(Engine::Singleton("Time", Time::get_singleton()));
|
||||||
Engine::get_singleton()->add_singleton(Engine::Singleton("GDExtensionManager", GDExtensionManager::get_singleton()));
|
Engine::get_singleton()->add_singleton(Engine::Singleton("GDExtensionManager", GDExtensionManager::get_singleton()));
|
||||||
Engine::get_singleton()->add_singleton(Engine::Singleton("ResourceUID", ResourceUID::get_singleton()));
|
Engine::get_singleton()->add_singleton(Engine::Singleton("ResourceUID", ResourceUID::get_singleton()));
|
||||||
Engine::get_singleton()->add_singleton(Engine::Singleton("WorkerThreadPool", WorkerThreadPool::get_singleton()));
|
Engine::get_singleton()->add_singleton(Engine::Singleton("WorkerThreadPool", worker_thread_pool));
|
||||||
|
|
||||||
OS::get_singleton()->benchmark_end_measure("Core", "Register Singletons");
|
OS::get_singleton()->benchmark_end_measure("Core", "Register Singletons");
|
||||||
}
|
}
|
||||||
@ -378,6 +382,8 @@ void unregister_core_types() {
|
|||||||
|
|
||||||
// Destroy singletons in reverse order to ensure dependencies are not broken.
|
// Destroy singletons in reverse order to ensure dependencies are not broken.
|
||||||
|
|
||||||
|
memdelete(worker_thread_pool);
|
||||||
|
|
||||||
memdelete(_engine_debugger);
|
memdelete(_engine_debugger);
|
||||||
memdelete(_marshalls);
|
memdelete(_marshalls);
|
||||||
memdelete(_classdb);
|
memdelete(_classdb);
|
||||||
|
@ -140,7 +140,6 @@ static Engine *engine = nullptr;
|
|||||||
static ProjectSettings *globals = nullptr;
|
static ProjectSettings *globals = nullptr;
|
||||||
static Input *input = nullptr;
|
static Input *input = nullptr;
|
||||||
static InputMap *input_map = nullptr;
|
static InputMap *input_map = nullptr;
|
||||||
static WorkerThreadPool *worker_thread_pool = nullptr;
|
|
||||||
static TranslationServer *translation_server = nullptr;
|
static TranslationServer *translation_server = nullptr;
|
||||||
static Performance *performance = nullptr;
|
static Performance *performance = nullptr;
|
||||||
static PackedData *packed_data = nullptr;
|
static PackedData *packed_data = nullptr;
|
||||||
@ -691,8 +690,6 @@ Error Main::test_setup() {
|
|||||||
|
|
||||||
register_core_settings(); // Here globals are present.
|
register_core_settings(); // Here globals are present.
|
||||||
|
|
||||||
worker_thread_pool = memnew(WorkerThreadPool);
|
|
||||||
|
|
||||||
translation_server = memnew(TranslationServer);
|
translation_server = memnew(TranslationServer);
|
||||||
tsman = memnew(TextServerManager);
|
tsman = memnew(TextServerManager);
|
||||||
|
|
||||||
@ -803,8 +800,6 @@ void Main::test_cleanup() {
|
|||||||
ResourceSaver::remove_custom_savers();
|
ResourceSaver::remove_custom_savers();
|
||||||
PropertyListHelper::clear_base_helpers();
|
PropertyListHelper::clear_base_helpers();
|
||||||
|
|
||||||
WorkerThreadPool::get_singleton()->finish();
|
|
||||||
|
|
||||||
#ifdef TOOLS_ENABLED
|
#ifdef TOOLS_ENABLED
|
||||||
GDExtensionManager::get_singleton()->deinitialize_extensions(GDExtension::INITIALIZATION_LEVEL_EDITOR);
|
GDExtensionManager::get_singleton()->deinitialize_extensions(GDExtension::INITIALIZATION_LEVEL_EDITOR);
|
||||||
uninitialize_modules(MODULE_INITIALIZATION_LEVEL_EDITOR);
|
uninitialize_modules(MODULE_INITIALIZATION_LEVEL_EDITOR);
|
||||||
@ -846,9 +841,6 @@ void Main::test_cleanup() {
|
|||||||
if (physics_server_2d_manager) {
|
if (physics_server_2d_manager) {
|
||||||
memdelete(physics_server_2d_manager);
|
memdelete(physics_server_2d_manager);
|
||||||
}
|
}
|
||||||
if (worker_thread_pool) {
|
|
||||||
memdelete(worker_thread_pool);
|
|
||||||
}
|
|
||||||
if (globals) {
|
if (globals) {
|
||||||
memdelete(globals);
|
memdelete(globals);
|
||||||
}
|
}
|
||||||
@ -939,7 +931,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
|
|||||||
|
|
||||||
register_core_settings(); //here globals are present
|
register_core_settings(); //here globals are present
|
||||||
|
|
||||||
worker_thread_pool = memnew(WorkerThreadPool);
|
|
||||||
translation_server = memnew(TranslationServer);
|
translation_server = memnew(TranslationServer);
|
||||||
performance = memnew(Performance);
|
performance = memnew(Performance);
|
||||||
GDREGISTER_CLASS(Performance);
|
GDREGISTER_CLASS(Performance);
|
||||||
@ -2629,10 +2620,6 @@ error:
|
|||||||
if (translation_server) {
|
if (translation_server) {
|
||||||
memdelete(translation_server);
|
memdelete(translation_server);
|
||||||
}
|
}
|
||||||
if (worker_thread_pool) {
|
|
||||||
worker_thread_pool->finish();
|
|
||||||
memdelete(worker_thread_pool);
|
|
||||||
}
|
|
||||||
if (globals) {
|
if (globals) {
|
||||||
memdelete(globals);
|
memdelete(globals);
|
||||||
}
|
}
|
||||||
@ -4514,8 +4501,6 @@ void Main::cleanup(bool p_force) {
|
|||||||
ResourceLoader::clear_translation_remaps();
|
ResourceLoader::clear_translation_remaps();
|
||||||
ResourceLoader::clear_path_remaps();
|
ResourceLoader::clear_path_remaps();
|
||||||
|
|
||||||
WorkerThreadPool::get_singleton()->finish();
|
|
||||||
|
|
||||||
ScriptServer::finish_languages();
|
ScriptServer::finish_languages();
|
||||||
|
|
||||||
// Sync pending commands that may have been queued from a different thread during ScriptServer finalization
|
// Sync pending commands that may have been queued from a different thread during ScriptServer finalization
|
||||||
@ -4606,9 +4591,6 @@ void Main::cleanup(bool p_force) {
|
|||||||
if (physics_server_2d_manager) {
|
if (physics_server_2d_manager) {
|
||||||
memdelete(physics_server_2d_manager);
|
memdelete(physics_server_2d_manager);
|
||||||
}
|
}
|
||||||
if (worker_thread_pool) {
|
|
||||||
memdelete(worker_thread_pool);
|
|
||||||
}
|
|
||||||
if (globals) {
|
if (globals) {
|
||||||
memdelete(globals);
|
memdelete(globals);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user