summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-15 11:59:00 +0000
committerseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-15 11:59:00 +0000
commite143a741913fd970e27eb83e3d809d9694038f9f (patch)
tree1e718e303e65eaad1ddce788dbc41cefa019d4bc
parent6b4132724aeb5cf25307a04fd7001065526873c9 (diff)
don't use keeper thread. [Bug #12342]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/drb/timeridconv.rb40
-rw-r--r--test/drb/ut_timerholder.rb70
3 files changed, 50 insertions, 66 deletions
diff --git a/ChangeLog b/ChangeLog
index 61ca0f78cfd..d454f91e866 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun May 15 20:55:31 2016 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+
+ * lib/drb/timeridconv.rb: don't use keeper thread. [Bug #12342]
+
+ * test/drb/ut_timerholder.rb: ditto.
+
Sun May 15 16:15:25 2016 NARUSE, Yui <naruse@ruby-lang.org>
* array.c (rb_ary_entry): extract rb_ary_elt to organize if-conditions
diff --git a/lib/drb/timeridconv.rb b/lib/drb/timeridconv.rb
index e83eb727657..7e2a6cf998b 100644
--- a/lib/drb/timeridconv.rb
+++ b/lib/drb/timeridconv.rb
@@ -18,26 +18,27 @@ module DRb
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
@@ -48,42 +49,35 @@ module DRb
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:
diff --git a/test/drb/ut_timerholder.rb b/test/drb/ut_timerholder.rb
index 1b992d95f3b..252c7bd228b 100644
--- a/test/drb/ut_timerholder.rb
+++ b/test/drb/ut_timerholder.rb
@@ -1,54 +1,38 @@
# frozen_string_literal: false
-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)
- def test_00
- do_test(0.5)
- end
+ 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)
+
+ assert_equal(idconv.to_obj(key), self)
+ sleep(keeping)
+
+ assert_equal(idconv.to_id(true), true.__id__)
+ sleep(keeping)
- def test_01
- do_test(1, 0.5)
+ 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
+