Skip to content

Fix a RactorLocalSingleton lazy mutex race #39

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

Open
havenwood wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −19
Open

Fix a RactorLocalSingleton lazy mutex race #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 1 addition & 19 deletions lib/singleton.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,32 +203,14 @@ module RactorLocalSingleton # :nodoc:
module RactorLocalSingletonClassMethods # :nodoc:
include Singleton::SingletonClassMethods
def instance
set_mutex(Thread::Mutex.new) if Ractor.current[mutex_key].nil?
return Ractor.current[instance_key] if Ractor.current[instance_key]
Ractor.current[mutex_key].synchronize {
return Ractor.current[instance_key] if Ractor.current[instance_key]
set_instance(new())
}
Ractor.current[instance_key]
Ractor.store_if_absent(instance_key) { new }
end

private

def instance_key
:"__RactorLocalSingleton_instance_with_class_id_#{object_id}__"
end

def mutex_key
:"__RactorLocalSingleton_mutex_with_class_id_#{object_id}__"
end

def set_instance(val)
Ractor.current[instance_key] = val
end

def set_mutex(val)
Ractor.current[mutex_key] = val
end
end

def self.module_with_class_methods
Expand Down