diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/rinda/tuplespace.rb | 13 | ||||
| -rw-r--r-- | test/rinda/test_rinda.rb | 14 |
3 files changed, 30 insertions, 5 deletions
@@ -1,3 +1,11 @@ +Sun Arg 12 03:56:30 2007 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> + + * lib/rinda/tuplespace.rb: fix Rinda::TupleSpace keeper thread bug. + the thread is started too early. [ruby-talk:264062] + + * test/rinda/test_rinda.rb: fix Rinda::TupleSpace keeper thread bug. + the thread is started too early. [ruby-talk:264062] + Sat Aug 11 07:34:10 2007 Tadayoshi Funaba <tadf@dotrb.org> * lib/date/format.rb: reverted some wrongly erased "o" options diff --git a/lib/rinda/tuplespace.rb b/lib/rinda/tuplespace.rb index 21389abdeb..0a9f27c5c9 100644 --- a/lib/rinda/tuplespace.rb +++ b/lib/rinda/tuplespace.rb @@ -449,7 +449,6 @@ module Rinda def write(tuple, sec=nil) entry = create_entry(tuple, sec) - start_keeper synchronize do if entry.expired? @read_waiter.find_all_template(entry).each do |template| @@ -459,6 +458,7 @@ module Rinda notify_event('delete', entry.value) else @bag.push(entry) + start_keeper if entry.expires @read_waiter.find_all_template(entry).each do |template| template.read(tuple) end @@ -484,7 +484,6 @@ module Rinda def move(port, tuple, sec=nil) template = WaitTemplateEntry.new(self, tuple, sec) yield(template) if block_given? - start_keeper synchronize do entry = @bag.find(template) if entry @@ -497,6 +496,7 @@ module Rinda begin @take_waiter.push(template) + start_keeper if template.expires while true raise RequestCanceledError if template.canceled? raise RequestExpiredError if template.expired? @@ -521,7 +521,6 @@ module Rinda def read(tuple, sec=nil) template = WaitTemplateEntry.new(self, tuple, sec) yield(template) if block_given? - start_keeper synchronize do entry = @bag.find(template) return entry.value if entry @@ -529,6 +528,7 @@ module Rinda begin @read_waiter.push(template) + start_keeper if template.expires template.wait raise RequestCanceledError if template.canceled? raise RequestExpiredError if template.expired? @@ -615,8 +615,11 @@ module Rinda def start_keeper return if @keeper && @keeper.alive? @keeper = Thread.new do - while need_keeper? - keep_clean + while true + synchronize do + break unless need_keeper? + keep_clean + end sleep(@period) end end diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb index d663e0446d..553d3078fe 100644 --- a/test/rinda/test_rinda.rb +++ b/test/rinda/test_rinda.rb @@ -240,6 +240,20 @@ module TupleSpaceTestModule end end + def test_ruby_talk_264062 + th = Thread.new { @ts.take([:empty], 1) } + sleep 2 + assert_raises(Rinda::RequestExpiredError) do + th.value + end + + th = Thread.new { @ts.read([:empty], 1) } + sleep 2 + assert_raises(Rinda::RequestExpiredError) do + th.value + end + end + def test_core_01 5.times do |n| @ts.write([:req, 2]) |