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

Optimize Thread::get_caller_id()

Browse Source 
By making sure that Thread always has a valid caller_id we can remove the
check making the function a straightforward getter instead.

In some quick tests we see a repeatable performance improvement of
somewhere around 0.32 mspf in TPS demo.

Co-authored-by: Pedro J. Estébanez <pedrojrulez@gmail.com>
This commit is contained in:
HP van Braam
2025-01-03 14:49:16 +01:00
parent bdf625bd54
commit 873eb21ce8
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/os/thread.cpp
View File

@@ -38,8 +38,8 @@
#include "core/object/script_language.h" #include "core/object/script_language.h"
SafeNumeric<uint64_t> Thread::id_counter(1); // The first value after .increment() is 2, hence by default the main thread ID should be 1. SafeNumeric<uint64_t> Thread::id_counter(1); // The first value after .increment() is 2, hence by default the main thread ID should be 1.
thread_local Thread::ID Thread::caller_id = Thread::id_counter.increment();
thread_local Thread::ID Thread::caller_id = Thread::UNASSIGNED_ID;
#endif #endif
Thread::PlatformFunctions Thread::platform_functions; Thread::PlatformFunctions Thread::platform_functions;

6
core/os/thread.h
View File

@@ -112,6 +112,7 @@ private:
static PlatformFunctions platform_functions; static PlatformFunctions platform_functions;
ID id = UNASSIGNED_ID; ID id = UNASSIGNED_ID;
static SafeNumeric<uint64_t> id_counter; static SafeNumeric<uint64_t> id_counter;
static thread_local ID caller_id; static thread_local ID caller_id;
THREADING_NAMESPACE::thread thread; THREADING_NAMESPACE::thread thread;
@@ -119,7 +120,7 @@ private:
static void callback(ID p_caller_id, const Settings &p_settings, Thread::Callback p_callback, void *p_userdata); static void callback(ID p_caller_id, const Settings &p_settings, Thread::Callback p_callback, void *p_userdata);
static void make_main_thread() { caller_id = MAIN_ID; } static void make_main_thread() { caller_id = MAIN_ID; }
static void release_main_thread() { caller_id = UNASSIGNED_ID; } static void release_main_thread() { caller_id = id_counter.increment(); }
public: public:
static void _set_platform_functions(const PlatformFunctions &p_functions); static void _set_platform_functions(const PlatformFunctions &p_functions);
@@ -127,9 +128,6 @@ public:
_FORCE_INLINE_ ID get_id() const { return id; } _FORCE_INLINE_ ID get_id() const { return id; }
// get the ID of the caller thread // get the ID of the caller thread
_FORCE_INLINE_ static ID get_caller_id() { _FORCE_INLINE_ static ID get_caller_id() {
if (unlikely(caller_id == UNASSIGNED_ID)) {
caller_id = id_counter.increment();
}
return caller_id; return caller_id;
} }
// get the ID of the main thread // get the ID of the main thread