Skip to content

Protect constant initializers with mutex on Windows #15134

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

Merged
straight-shoota merged 2 commits into from
Oct 31, 2024
Merged

Protect constant initializers with mutex on Windows #15134

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b80133
Protect constant initializers with mutex on Windows
HertzDevil Oct 29, 2024
af6aad1
Merge branch 'master' into bug/win32-const-mt
HertzDevil Oct 30, 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
11 changes: 7 additions & 4 deletions src/crystal/once.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
# :nodoc:
class Crystal::OnceState
@rec = [] of Bool*
{% if flag?(:preview_mt) %}
@mutex = Mutex.new(:reentrant)
{% end %}

def once(flag : Bool*, initializer : Void*)
unless flag.value
Expand All @@ -29,7 +26,13 @@ class Crystal::OnceState
end
end

{% if flag?(:preview_mt) %}
# on Win32, `Crystal::System::FileDescriptor#@@reader_thread` spawns a new
# thread even without the `preview_mt` flag, and the thread can also reference
# Crystal constants, leading to race conditions, so we always enable the mutex
# TODO: can this be improved?
{% if flag?(:preview_mt) || flag?(:win32) %}
@mutex = Mutex.new(:reentrant)

def once(flag : Bool*, initializer : Void*)
unless flag.value
@mutex.synchronize do
Expand Down