Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use a Dict instead of an IdDict for caching of the cwstring for Windows env variables #52758

Merged
merged 4 commits into from
Jan 8, 2024
Merged

use a Dict instead of an IdDict for caching of the cwstring for Windows env variables #52758

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3075dd
use a Dict instead of an IdDict for caching of the `cwstring` for Win…
Jan 5, 2024
5a3a238
also lock on access
KristofferC Jan 5, 2024
abdef50
webbrowser editing...
KristofferC Jan 5, 2024
0385eaa
nicer
KristofferC Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions base/env.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,22 @@
if Sys.iswindows()
const ERROR_ENVVAR_NOT_FOUND = UInt32(203)

const env_dict = IdDict{String, Vector{Cwchar_t}}()
const env_dict = Dict{String, Vector{Cwchar_t}}()
const env_lock = ReentrantLock()

function memoized_env_lookup(str::AbstractString)
# Windows environment variables have a different format from Linux / MacOS, and previously
# incurred allocations because we had to convert a String to a Vector{Cwchar_t} each time
# an environment variable was looked up. This function memoizes that lookup process, storing
# the String => Vector{Cwchar_t} pairs in env_dict
var = get(env_dict, str, nothing)
if isnothing(var)
var = @lock env_lock begin
env_dict[str] = cwstring(str)
@lock env_lock begin
var = get(env_dict, str, nothing)
if isnothing(var)
var = cwstring(str)
env_dict[str] = var
end
return var
end
var
end

_getenvlen(var::Vector{UInt16}) = ccall(:GetEnvironmentVariableW,stdcall,UInt32,(Ptr{UInt16},Ptr{UInt16},UInt32),var,C_NULL,0)
Expand Down