@@ -11,9 +11,11 @@ module NeverBlock @fiber = Fiber.current #puts ">>>>>register_with_event_loop fiber #{@fiber.inspect}" # When there's no previous em_connection - unless @fiber[em_connection_with_pool_key] - @fiber[em_connection_with_pool_key] = EM::attach(socket,EMConnectionHandler,self) + key = em_connection_with_pool_key + unless @fiber[key] + @fiber[key] = EM::attach(socket,EMConnectionHandler,self) @fiber[:callbacks] << self.method(:unregister_from_event_loop) + @fiber[:em_keys] << key end else raise ::NB::NBError.new("FiberedDBConnection: EventMachine reactor not running") @@ -23,9 +25,10 @@ module NeverBlock # Unattaches the connection socket from the event loop def unregister_from_event_loop #puts ">>>>>unregister_from_event_loop #{self.inspect} #{@fiber.inspect}" - if em_c = @fiber[em_connection_with_pool_key] + key = @fiber[:em_keys].pop + if em_c = @fiber[key] em_c.detach - @fiber[em_connection_with_pool_key] = nil + @fiber[key] = nil true else false @@ -41,7 +44,8 @@ module NeverBlock # Closes the connection using event loop def event_loop_connection_close - @fiber[em_connection_with_pool_key].close_connection if @fiber[em_connection_with_pool_key] + key = em_connection_with_pool_key + @fiber[key].close_connection if @fiber[key] end # The callback, this is called whenever lib/never_block/db/fibered_db_connection.rb @@ -48,6 +48,7 @@ module NeverBlock end end fiber[:callbacks] = [] + fiber[:em_keys] = [] fiber[:neverblock] = true @fibers << fiber end lib/never_block/pool/fiber_pool.rb 0a09a7e06af2e2d315e4094e98a566899618b5f0 Stephen Sykes sds@Macintosh-40.(none) http://github.com/espace/neverblock/commit/ae7d4cc26d52e578dee65bff01991cb40d1e592b ae7d4cc26d52e578dee65bff01991cb40d1e592b 2008-12-04T03:51:21-08:00 2008-12-04T03:51:21-08:00 Fix crash due to wrong EM connection being detatched from 39504811490542fc3479818d922f2ea570b85e6b Stephen Sykes sds@Macintosh-40.(none)