diff options
| author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2023-11-22 18:53:48 +0100 |
|---|---|---|
| committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2023-11-22 20:07:01 +0100 |
| commit | f26328e9a308d47b1672d63adfbf2bbff29f42c4 (patch) | |
| tree | bcfb7b1f1a22380a84dfbcb393b0163ff957aa5e /modules/gdscript/gdscript.h | |
| parent | c2f8fb301537a5d688d201178985963282b4f9c3 (diff) | |
| download | redot-engine-f26328e9a308d47b1672d63adfbf2bbff29f42c4.tar.gz | |
Revert recently added approach to cross-thread lambda survival
Commits reverted:
- 1ed69191483002ee62ec5b4d5adb16d3bc315ef3
- 271511726b02848783904429c8dde857f6266429
Diffstat (limited to 'modules/gdscript/gdscript.h')
| -rw-r--r-- | modules/gdscript/gdscript.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/modules/gdscript/gdscript.h b/modules/gdscript/gdscript.h index 8d62334d69..9717dd7ff1 100644 --- a/modules/gdscript/gdscript.h +++ b/modules/gdscript/gdscript.h @@ -128,16 +128,11 @@ class GDScript : public Script { Mutex *mutex = nullptr; }; static thread_local UpdatableFuncPtr func_ptrs_to_update_thread_local; - static thread_local LocalVector<List<UpdatableFuncPtr *>::Element> func_ptrs_to_update_entries_thread_local; - static UpdatableFuncPtr *func_ptrs_to_update_main_thread; List<UpdatableFuncPtr *> func_ptrs_to_update; - List<UpdatableFuncPtrElement> func_ptrs_to_update_elems; Mutex func_ptrs_to_update_mutex; - List<UpdatableFuncPtrElement>::Element *_add_func_ptr_to_update(GDScriptFunction **p_func_ptr_ptr); - static void _remove_func_ptr_to_update(List<UpdatableFuncPtrElement>::Element *p_func_ptr_element); - - static void _fixup_thread_function_bookkeeping(); + UpdatableFuncPtrElement _add_func_ptr_to_update(GDScriptFunction **p_func_ptr_ptr); + static void _remove_func_ptr_to_update(const UpdatableFuncPtrElement p_func_ptr_element); #ifdef TOOLS_ENABLED // For static data storage during hot-reloading. @@ -559,10 +554,6 @@ public: virtual void add_named_global_constant(const StringName &p_name, const Variant &p_value) override; virtual void remove_named_global_constant(const StringName &p_name) override; - /* MULTITHREAD FUNCTIONS */ - - virtual void thread_exit() override; - /* DEBUGGER FUNCTIONS */ virtual String debug_get_error() const override; |