ruby-changes:43856
From: usa <ko1@a...>
Date: Tue, 16 Aug 2016 14:53:21 +0900 (JST)
Subject: [ruby-changes:43856] usa:r55929 (ruby_2_2): merge revision(s) 55008: [Backport #12342]
usa 2016-08-16 14:53:14 +0900 (Tue, 16 Aug 2016) New Revision: 55929 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55929 Log: merge revision(s) 55008: [Backport #12342] * lib/drb/timeridconv.rb: don't use keeper thread. [Bug #12342] * test/drb/ut_timerholder.rb: ditto. Modified directories: branches/ruby_2_2/ Modified files: branches/ruby_2_2/ChangeLog branches/ruby_2_2/lib/drb/timeridconv.rb branches/ruby_2_2/test/drb/ut_timerholder.rb branches/ruby_2_2/version.h Index: ruby_2_2/lib/drb/timeridconv.rb =================================================================== --- ruby_2_2/lib/drb/timeridconv.rb (revision 55928) +++ ruby_2_2/lib/drb/timeridconv.rb (revision 55929) @@ -17,26 +17,27 @@ module DRb https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/drb/timeridconv.rb#L17 class InvalidIndexError < RuntimeError; end - def initialize(timeout=600) + def initialize(keeping=600) super() @sentinel = Object.new @gc = {} - @curr = {} @renew = {} - @timeout = timeout - @keeper = keeper + @keeping = keeping + @expires = Time.now + @keeping end def add(obj) synchronize do + rotate key = obj.__id__ - @curr[key] = obj + @renew[key] = obj return key end end def fetch(key, dv=@sentinel) synchronize do + rotate obj = peek(key) if obj == @sentinel return dv unless dv == @sentinel @@ -47,42 +48,35 @@ module DRb https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/drb/timeridconv.rb#L48 end end - def include?(key) - synchronize do - obj = peek(key) - return false if obj == @sentinel - true - end - end - + private def peek(key) synchronize do - return @curr.fetch(key, @renew.fetch(key, @gc.fetch(key, @sentinel))) + return @renew.fetch(key) { @gc.fetch(key, @sentinel) } end end - private - def alternate + def rotate synchronize do - @gc = @curr # GCed - @curr = @renew + return if @expires > Time.now + @gc = @renew # GCed @renew = {} + @expires = Time.now + @keeping end end def keeper Thread.new do loop do - alternate - sleep(@timeout) + rotate + sleep(@keeping) end end end end - # Creates a new TimerIdConv which will hold objects for +timeout+ seconds. - def initialize(timeout=600) - @holder = TimerHolder2.new(timeout) + # Creates a new TimerIdConv which will hold objects for +keeping+ seconds. + def initialize(keeping=600) + @holder = TimerHolder2.new(keeping) end def to_obj(ref) # :nodoc: Index: ruby_2_2/ChangeLog =================================================================== --- ruby_2_2/ChangeLog (revision 55928) +++ ruby_2_2/ChangeLog (revision 55929) @@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1 +Tue Aug 16 14:43:00 2016 Masatoshi SEKI <m_seki@m...> + + * lib/drb/timeridconv.rb: don't use keeper thread. [Bug #12342] + + * test/drb/ut_timerholder.rb: ditto. + Tue Aug 16 14:07:18 2016 Marcus Stollsteimer <sto.mar@w...> * ext/json/lib/*.rb: Removed some comments. Because these are unnecessary Index: ruby_2_2/version.h =================================================================== --- ruby_2_2/version.h (revision 55928) +++ ruby_2_2/version.h (revision 55929) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1 #define RUBY_VERSION "2.2.6" #define RUBY_RELEASE_DATE "2016-08-16" -#define RUBY_PATCHLEVEL 357 +#define RUBY_PATCHLEVEL 358 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 8 Index: ruby_2_2/test/drb/ut_timerholder.rb =================================================================== --- ruby_2_2/test/drb/ut_timerholder.rb (revision 55928) +++ ruby_2_2/test/drb/ut_timerholder.rb (revision 55929) @@ -1,53 +1,37 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/drb/ut_timerholder.rb#L1 -require 'runit/testcase' -require 'runit/cui/testrunner' -require 'timerholder' +require 'test/unit' +require 'drb/timeridconv' module DRbTests -class TimerHolderTest < RUNIT::TestCase - def do_test(timeout, keeper_sleep = nil) - holder = TimerHolder.new(timeout) - holder.keeper_sleep = keeper_sleep if keeper_sleep - key = holder.add(self) - sleep(timeout * 0.5) - assert_equal(holder.peek(key), self) - holder.delete(key) - assert(!holder.include?(key)) - key = holder.add(self) - sleep(timeout+0.5) - assert_equal(holder.fetch(key), nil) - key = holder.add(self) - assert_equal(holder.fetch(key), self) - holder.store(key, true) - assert_equal(holder.fetch(key), true) - assert_equal(holder.include?(key), true) - sleep(timeout+0.5) - assert_exception(TimerHolder::InvalidIndexError) do - holder.store(key, 1) - end - assert_equal(holder.include?(key), false) - key = holder.add(self) - sleep(timeout * 0.5) - assert(holder.include?(key)) - holder.extend(key, timeout) - sleep(timeout * 0.5) - assert(holder.include?(key)) - sleep(timeout * 0.6) - assert(!holder.include?(key)) - holder.delete(key) - end +class TimerIdConvTest < Test::Unit::TestCase + def test_usecase_01 + keeping = 0.1 + idconv = DRb::TimerIdConv.new(keeping) + + key = idconv.to_id(self) + assert_equal(key, self.__id__) + sleep(keeping) + + assert_equal(idconv.to_id(false), false.__id__) + assert_equal(idconv.to_obj(key), self) + sleep(keeping) - def test_00 - do_test(0.5) - end + assert_equal(idconv.to_obj(key), self) + sleep(keeping) - def test_01 - do_test(1, 0.5) + assert_equal(idconv.to_id(true), true.__id__) + sleep(keeping) + + assert_raise do + assert_equal(idconv.to_obj(key)) + end + + assert_raise do + assert_equal(idconv.to_obj(false.__id__)) + end end end -end -if __FILE__ == $0 - RUNIT::CUI::TestRunner.run(DRbTests::TimerHolderTest.suite) end + Property changes on: ruby_2_2 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r55008 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/