asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #45312 from qarmin/remove_thread_lightmapper

Browse source 
Remove thread after use to prevent memory leak
This commit is contained in:
Rémi Verschelde 2021-01-20 10:43:03 +01:00 committed by GitHub
commit 6d5daac3e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats 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);
_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 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
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::wait_to_finish(runner_thread);
memdelete(runner_thread);
#endif
thread_cancelled = false;