ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-04 14:48:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3345 from laytan/speed-up-path-to-fullpath

Browse Source 
fix not setting ok in cached code path
This commit is contained in:
Jeroen van Rijn
2024-03-28 19:27:31 +01:00
committed by GitHub
parent 9b43aa3c94 9a5a39c07d
commit 7325120ca9
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/build_settings.cpp
+23 -6
View File
@@ -1189,12 +1189,19 @@ gb_internal String path_to_fullpath(gbAllocator a, String s, bool *ok_) {
return result; return result;
} }
#elif defined(GB_SYSTEM_OSX) || defined(GB_SYSTEM_UNIX) #elif defined(GB_SYSTEM_OSX) || defined(GB_SYSTEM_UNIX)
gb_internal String path_to_fullpath(gbAllocator a, String s, bool *ok_) {
static gb_thread_local StringMap<String> cache;
String* cached = string_map_get(&cache, s); struct PathToFullpathResult {
String result;
bool ok;
};
gb_internal String path_to_fullpath(gbAllocator a, String s, bool *ok_) {
static gb_thread_local StringMap<PathToFullpathResult> cache;
PathToFullpathResult *cached = string_map_get(&cache, s);
if (cached != nullptr) { if (cached != nullptr) {
return copy_string(a, *cached); if (ok_) *ok_ = cached->ok;
return copy_string(a, cached->result);
} }
char *p; char *p;
@@ -1213,12 +1220,22 @@ gb_internal String path_to_fullpath(gbAllocator a, String s, bool *ok_) {
// I have opted for 2 because it is much simpler + we already return `ok = false` + further // I have opted for 2 because it is much simpler + we already return `ok = false` + further
// checks and processes will use the path and cause errors (which we want). // checks and processes will use the path and cause errors (which we want).
String result = copy_string(a, s); String result = copy_string(a, s);
string_map_set(&cache, copy_string(permanent_allocator(), s), copy_string(permanent_allocator(), result));
PathToFullpathResult cached_result = {};
cached_result.result = copy_string(permanent_allocator(), result);
cached_result.ok = false;
string_map_set(&cache, copy_string(permanent_allocator(), s), cached_result);
return result; return result;
} }
if (ok_) *ok_ = true; if (ok_) *ok_ = true;
String result = copy_string(a, make_string_c(p)); String result = copy_string(a, make_string_c(p));
string_map_set(&cache, copy_string(permanent_allocator(), s), copy_string(permanent_allocator(), result));
PathToFullpathResult cached_result = {};
cached_result.result = copy_string(permanent_allocator(), result);
cached_result.ok = true;
string_map_set(&cache, copy_string(permanent_allocator(), s), cached_result);
return result; return result;
} }
#else #else