hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #115396 from DeeJayLSP/faster-uid-path-2

Browse source 
Prevent unnecessary memory allocations when reading UID cache
This commit is contained in:
Thaddeus Crews 2026-02-16 15:02:31 -06:00
commit b151a2d966
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
core/io/resource_uid.cpp
View file

@ -357,18 +357,21 @@ String ResourceUID::get_path_from_cache(Ref<FileAccess> &p_cache_file, const Str
const int64_t uid_from_string = singleton->text_to_id(p_uid_string);
if (uid_from_string != INVALID_ID) {
const uint32_t entry_count = p_cache_file->get_32();
CharString cs;
for (uint32_t i = 0; i < entry_count; i++) {
int64_t id = p_cache_file->get_64();
int32_t len = p_cache_file->get_32();
cs.resize_uninitialized(len + 1);
ERR_FAIL_COND_V(cs.size() != len + 1, String());
cs[len] = 0;
int32_t rl = p_cache_file->get_buffer((uint8_t *)cs.ptrw(), len);
ERR_FAIL_COND_V(rl != len, String());
if (id == uid_from_string) {
CharString cs;
cs.resize_uninitialized(len + 1);
ERR_FAIL_COND_V(cs.size() != len + 1, String());
cs[len] = 0;
int32_t rl = p_cache_file->get_buffer((uint8_t *)cs.ptrw(), len);
ERR_FAIL_COND_V(rl != len, String());
return String::utf8(cs.get_data());
} else {
p_cache_file->seek(p_cache_file->get_position() + len);
ERR_FAIL_COND_V(p_cache_file->eof_reached(), String());
}
}
}