From 35b046ddf7eab341256cced9d1c77e168c52e256 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sun, 27 Dec 2020 16:49:46 +0100 Subject: [PATCH] Add an `OS.get_thread_caller_id()` method This can be used to print thread IDs in logs. This can make it easier to debug multi-threaded applications. Co-authored-by: Khaos --- core/core_bind.cpp | 5 +++++ core/core_bind.h | 1 + doc/classes/OS.xml | 8 ++++++++ 3 files changed, 14 insertions(+) diff --git a/core/core_bind.cpp b/core/core_bind.cpp index 259d899d396..b06396230ff 100644 --- a/core/core_bind.cpp +++ b/core/core_bind.cpp @@ -290,6 +290,10 @@ Error _OS::set_thread_name(const String &p_name) { return Thread::set_name(p_name); } +Thread::ID _OS::get_thread_caller_id() const { + return Thread::get_caller_id(); +}; + bool _OS::has_feature(const String &p_feature) const { return OS::get_singleton()->has_feature(p_feature); } @@ -758,6 +762,7 @@ void _OS::_bind_methods() { ClassDB::bind_method(D_METHOD("set_use_file_access_save_and_swap", "enabled"), &_OS::set_use_file_access_save_and_swap); ClassDB::bind_method(D_METHOD("set_thread_name", "name"), &_OS::set_thread_name); + ClassDB::bind_method(D_METHOD("get_thread_caller_id"), &_OS::get_thread_caller_id); ClassDB::bind_method(D_METHOD("has_feature", "tag_name"), &_OS::has_feature); diff --git a/core/core_bind.h b/core/core_bind.h index f3a77a4fa6f..ce4ab1d5fb6 100644 --- a/core/core_bind.h +++ b/core/core_bind.h @@ -232,6 +232,7 @@ public: String get_user_data_dir() const; Error set_thread_name(const String &p_name); + Thread::ID get_thread_caller_id() const; bool has_feature(const String &p_feature) const; diff --git a/doc/classes/OS.xml b/doc/classes/OS.xml index 65a815a603c..f72590f62f5 100644 --- a/doc/classes/OS.xml +++ b/doc/classes/OS.xml @@ -127,6 +127,14 @@ Returns the keycode of the given string (e.g. "Escape"). + + + + + Returns the ID of the current thread. This can be used in logs to ease debugging of multi-threaded applications. + [b]Note:[/b] Thread IDs are not deterministic and may be reused across application restarts. + +