Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #105192 from Ivorforce/stringname-binary-mutex

Browse source 
Use non-recursive mutex for `StringName`, improving performance
This commit is contained in:
Thaddeus Crews 2025-04-28 14:10:51 -05:00
commit 80eba98e9b
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
4 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/object/object.cpp
View file

@ -2226,6 +2226,16 @@ void Object::detach_from_objectdb() {
}
}
void Object::assign_class_name_static(const Span<char> &p_name, StringName &r_target) {
static BinaryMutex _mutex;
MutexLock lock(_mutex);
if (r_target) {
// Already assigned while we were waiting for the mutex.
return;
}
r_target = StringName(p_name.ptr(), true);
}
Object::~Object() {
if (script_instance) {
memdelete(script_instance);

6
core/object/object.h
View file

@ -425,7 +425,7 @@ public:
static const StringName &get_class_static() { \
static StringName _class_name_static; \
if (unlikely(!_class_name_static)) { \
StringName::assign_static_unique_class_name(&_class_name_static, #m_class); \
assign_class_name_static(#m_class, _class_name_static); \
} \
return _class_name_static; \
} \
@ -811,10 +811,12 @@ public:
};
/* TYPE API */
static void assign_class_name_static(const Span<char> &p_name, StringName &r_target);
static const StringName &get_class_static() {
static StringName _class_name_static;
if (unlikely(!_class_name_static)) {
StringName::assign_static_unique_class_name(&_class_name_static, "Object");
assign_class_name_static("Object", _class_name_static);
}
return _class_name_static;
}

9
core/string/string_name.cpp
View file

@ -39,7 +39,7 @@ struct StringName::Table {
constexpr static uint32_t TABLE_MASK = TABLE_LEN - 1;
static inline _Data *table[TABLE_LEN];
static inline Mutex mutex;
static inline BinaryMutex mutex;
static inline PagedAllocator<_Data> allocator;
};
@ -208,13 +208,6 @@ StringName::StringName(const StringName &p_name) {
}
}
void StringName::assign_static_unique_class_name(StringName *ptr, const char *p_name) {
MutexLock lock(Table::mutex);
if (*ptr == StringName()) {
*ptr = StringName(p_name, true);
}
}
StringName::StringName(const char *p_name, bool p_static) {
_data = nullptr;

2
core/string/string_name.h
View file

@ -178,8 +178,6 @@ public:
StringName(const String &p_name, bool p_static = false);
StringName() {}
static void assign_static_unique_class_name(StringName *ptr, const char *p_name);
#ifdef SIZE_EXTRA
_NO_INLINE_
#else