@@ -133,6 +133,7 @@ module Reactor # mode can be either :read or :write def detach(mode, io, force=false) selectables = @selectables[mode] || raise("mode is not :read or :write") + return unless selectables[:ios].include?(io.object_id) if !force && selectables[:callbacks][io.object_id].length > 1 selectables[:callbacks][io.object_id].shift else @@ -140,7 +141,7 @@ module Reactor selectables[:callbacks].delete(io.object_id) selectables[:dirty] = true end - @on_detach.call(mode, io) if @on_attach + @on_detach.call(mode, io) if @on_detach end # Supply a callback to on_detach that will be called @@ -162,7 +163,7 @@ module Reactor # # mode can be either :read or :write def attached?(mode, io) - @selectables[mode][:ios].include? io + @selectables[mode][:ios].include? io.object_id end # Add a block of code that will fire after some time @@ -215,7 +216,12 @@ module Reactor end def fire_ios(mode, ios) - ios.each {|io|@selectables[mode][:callbacks][io.object_id][0].call(io, self)} + ios.each do |io| + # an io might get detached while we are in this loop + # so we just ignore it + callback = @selectables[mode][:callbacks][io.object_id] + callback[0].call(io, self) if callback + end end end end lib/reactor.rb @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = "reactor" - s.version = "0.2.2" - s.date = "2009-07-09" + s.version = "0.2.3" + s.date = "2009-07-10" s.summary = "A pure Ruby reactor library" s.email = "oldmoe@gmail.com" s.homepage = "http://github.com/oldmoe/reactor" reactor.gemspec 046215a2a089fb77c38fe4311c98250ef2c8ad2c oldmoe oldmoe@gmail.com http://github.com/oldmoe/reactor/commit/17b32708f5238df337b5f2b70a34a4f0454fee03 17b32708f5238df337b5f2b70a34a4f0454fee03 2009-07-10T11:15:54-07:00 2009-07-10T11:15:54-07:00 fixed a bug in attached? and added better io firing 5f03fab713c9d7960dd96c6278575b6e94904b6b oldmoe oldmoe@gmail.com