1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use a mutex to make SortedSet.setup thread-safe

Browse Source 
This should fix [Bug #13735].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2017-10-21 15:57:32 +00:00
parent 76e3825376
commit 8daa6985dc
1 changed files with 79 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/set.rb
View File

@ -634,6 +634,7 @@ end
# #
class SortedSet < Set class SortedSet < Set
@@setup = false @@setup = false
@@mutex = Mutex.new
class << self class << self
def [](*ary) # :nodoc: def [](*ary) # :nodoc:
@ -643,6 +644,7 @@ class SortedSet < Set
def setup # :nodoc: def setup # :nodoc:
@@setup and return @@setup and return
@@mutex.synchronize do
# a hack to shut up warning # a hack to shut up warning
alias_method :old_init, :initialize alias_method :old_init, :initialize
@ -729,13 +731,13 @@ class SortedSet < Set
end end
END END
end end
# a hack to shut up warning # a hack to shut up warning
remove_method :old_init remove_method :old_init
@@setup = true @@setup = true
end end
end end
end
def initialize(*args, &block) # :nodoc: def initialize(*args, &block) # :nodoc:
SortedSet.setup SortedSet.setup