casraf/redot-engine
1
0
Fork 0
mirror of https://github.com/chenasraf/redot-engine.git synced 2026-05-18 01:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "WorkerThreadPool: Enhance lifetime for more flexibility"

Browse Source 
This reverts commit 2d1dd41ef5.
This commit is contained in:
Pedro J. Estébanez
2024-09-13 12:59:48 +02:00
parent d5d6c730bf
commit e2fd88ed91
3 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main/main.cpp
View File

@@ -140,7 +140,6 @@ static Engine *engine = nullptr;
static ProjectSettings *globals = nullptr;
static Input *input = nullptr;
static InputMap *input_map = nullptr;
static WorkerThreadPool *worker_thread_pool = nullptr;
static TranslationServer *translation_server = nullptr;
static Performance *performance = nullptr;
static PackedData *packed_data = nullptr;
@@ -691,8 +690,6 @@ Error Main::test_setup() {
register_core_settings(); // Here globals are present.
worker_thread_pool = memnew(WorkerThreadPool);
translation_server = memnew(TranslationServer);
tsman = memnew(TextServerManager);
@@ -803,8 +800,6 @@ void Main::test_cleanup() {
ResourceSaver::remove_custom_savers();
PropertyListHelper::clear_base_helpers();
WorkerThreadPool::get_singleton()->finish();
#ifdef TOOLS_ENABLED
GDExtensionManager::get_singleton()->deinitialize_extensions(GDExtension::INITIALIZATION_LEVEL_EDITOR);
uninitialize_modules(MODULE_INITIALIZATION_LEVEL_EDITOR);
@@ -846,9 +841,6 @@ void Main::test_cleanup() {
if (physics_server_2d_manager) {
memdelete(physics_server_2d_manager);
}
if (worker_thread_pool) {
memdelete(worker_thread_pool);
}
if (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
worker_thread_pool = memnew(WorkerThreadPool);
translation_server = memnew(TranslationServer);
performance = memnew(Performance);
GDREGISTER_CLASS(Performance);
@@ -2629,10 +2620,6 @@ error:
if (translation_server) {
memdelete(translation_server);
}
if (worker_thread_pool) {
worker_thread_pool->finish();
memdelete(worker_thread_pool);
}
if (globals) {
memdelete(globals);
}
@@ -4514,8 +4501,6 @@ void Main::cleanup(bool p_force) {
ResourceLoader::clear_translation_remaps();
ResourceLoader::clear_path_remaps();
WorkerThreadPool::get_singleton()->finish();
ScriptServer::finish_languages();
// 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) {
memdelete(physics_server_2d_manager);
}
if (worker_thread_pool) {
memdelete(worker_thread_pool);
}
if (globals) {
memdelete(globals);
}