godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Remove thread after use to prevent memory leak

Browse Source
This commit is contained in:
Rafał Mikrut
2021-01-20 09:37:25 +01:00
parent 2fa93d8514
commit d025194602
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/os/thread.h
View File

@@ -71,7 +71,7 @@ public:
static Error set_name(const String &p_name); static Error set_name(const String &p_name);
_FORCE_INLINE_ static ID get_main_id() { return _main_thread_id; } ///< get the ID of the main thread _FORCE_INLINE_ static ID get_main_id() { return _main_thread_id; } ///< get the ID of the main thread
static ID get_caller_id(); ///< get the ID of the caller function ID static ID get_caller_id(); ///< get the ID of the caller function ID
static void wait_to_finish(Thread *p_thread); ///< waits until thread is finished, and deallocates it. static void wait_to_finish(Thread *p_thread); ///< waits until thread is finished
static Thread *create(ThreadCreateCallback p_callback, void *p_user, const Settings &p_settings = Settings()); ///< Static function to create a thread, will call p_callback static Thread *create(ThreadCreateCallback p_callback, void *p_user, const Settings &p_settings = Settings()); ///< Static function to create a thread, will call p_callback
virtual ~Thread(); virtual ~Thread();

1
modules/lightmapper_cpu/lightmapper_cpu.cpp
View File

@@ -264,6 +264,7 @@ bool LightmapperCPU::_parallel_run(int p_count, const String &p_description, Bak
} }
thread_cancelled = cancelled; thread_cancelled = cancelled;
Thread::wait_to_finish(runner_thread); Thread::wait_to_finish(runner_thread);
memdelete(runner_thread);
#endif #endif
thread_cancelled = false; thread_cancelled = false;