Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 13:49:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #113526 from Ivorforce/tracy-profile-nocrash

Browse source 
Make `!configured` checks in `profiling.cpp` soft checks instead of crashing
This commit is contained in:
Rémi Verschelde 2025-12-04 13:21:52 +01:00
commit 8f3801aaec
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/profiling/profiling.cpp
View file

@ -39,6 +39,9 @@
namespace TracyInternal {
static bool configured = false;
static const char dummy_string[] = "dummy";
static tracy::SourceLocationData dummy_source_location = tracy::SourceLocationData{ dummy_string, dummy_string, dummy_string, 0, 0 };
// Implementation similar to StringName.
struct StringInternData {
StringName name;
@ -109,12 +112,14 @@ const StringInternData *_intern_name(const StringName &p_name) {
}
const char *intern_name(const StringName &p_name) {
ERR_FAIL_COND_V(!configured, dummy_string);
MutexLock lock(TracyInternTable::mutex);
return _intern_name(p_name)->name_utf8.get_data();
}
const tracy::SourceLocationData *intern_source_location(const void *p_function_ptr, const StringName &p_file, const StringName &p_function, uint32_t p_line) {
CRASH_COND(!configured);
ERR_FAIL_COND_V(!configured, &dummy_source_location);
const uint32_t hash = HashMapHasherDefault::hash(p_function_ptr);
const uint32_t idx = hash & TracyInternTable::TABLE_MASK;