espace-neverblock 0.1.5 → 0.1.6

data/lib/active_record/connection_adapters/neverblock_postgresql_adapter.rb

@@ -9,28 +9,18 @@ class ActiveRecord::ConnectionAdapters::NeverBlockPostgreSQLAdapter < ActiveReco
         'NeverBlockPostgreSQL'
       end
 
-      def begin_db_transaction
-        @connection.begin_db_transaction
-      end
-      
-      def commit_db_transaction
-        @connection.commit_db_transaction
-      end
-
-      def rollback_db_transaction
-        @connection.rollback_db_transaction
-      end
       # Executes an INSERT query and returns the new record's ID, this wont
       # work on earlier versions of PostgreSQL but they don't suppor the async
       # interface anyway
-      def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
-        @connection.exec(sql << " returning id ") 
-      end
+#      def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
+#        @connection.exec(sql << " returning id ") 
+#      end
 
       def connect
-        @connection = ::NB::DB::PooledFiberedPostgresConnection.new(@connection_options[0]) do
-          conn = PGconn.connect(*@connection_options[1..(@connection_options.length-1)])
-          PGconn.translate_results = false if PGconn.respond_to?(:translate_results=)
+        @connection = ::NB::DB::PooledDBConnection.new(@connection_parameters[0]) do
+          conn = ::NB::DB::FiberedPostgresConnection.connect(*@connection_parameters[1..(@connection_parameters.length-1)])
+=begin
+          ::NB::DB::FiberedPostgresConnection.translate_results = false if ::NB::DB::FiberedPostgresConnection.respond_to?(:translate_results=)
           # Ignore async_exec and async_query when using postgres-pr.
           @async = @config[:allow_concurrency] && @connection.respond_to?(:async_exec)
           # Use escape string syntax if available. We cannot do this lazily when encountering
@@ -59,6 +49,8 @@ class ActiveRecord::ConnectionAdapters::NeverBlockPostgreSQLAdapter < ActiveReco
             end_eval
             #configure_connection
           end
+	  conn
+=end
         end
       end
 

data/lib/never_block/db/fibered_db_connection.rb

@@ -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]
-            @fiber[:em_connection] = 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]
+        key = @fiber[:em_keys].pop
+        if em_c = @fiber[key]
           em_c.detach
-          @fiber[:em_connection] = 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].close_connection if @fiber[:em_connection]
+        key = em_connection_with_pool_key
+        @fiber[key].close_connection if @fiber[key]
       end
            
       # The callback, this is called whenever
@@ -50,6 +54,10 @@ module NeverBlock
         @fiber.resume if @fiber
       end
       
+      private
+      def em_connection_with_pool_key
+        "em_#{@fiber[:current_pool_key]}".intern
+      end
     end
     
     module EMConnectionHandler

data/lib/never_block/db/fibered_mysql_connection.rb

@@ -32,7 +32,7 @@ module NeverBlock
       # the execution in a blocking way.
       def query(sql)
         if NB.event_loop_available? && NB.neverblocking?
-          raise ::NB::NBError.new("FiberedMysqlConnection: The running fiber is attached to a connection other than the current one") if (c = Fiber.current[:connection]) && c != self
+          raise ::NB::NBError.new("FiberedMysqlConnection: The running fiber is attached to a connection other than the current one") if (c = Fiber.current[Fiber.current[:current_pool_key]]) && c != self
           begin
             send_query sql
             Fiber.yield register_with_event_loop

data/lib/never_block/pool/fiber_pool.rb

@@ -48,6 +48,7 @@ module NeverBlock
             end
           end
           fiber[:callbacks] = []
+          fiber[:em_keys] = []
           fiber[:neverblock] = true
           @fibers << fiber
         end

data/lib/never_block/pool/fibered_connection_pool.rb

@@ -53,7 +53,7 @@ module NeverBlock
         fiber = Fiber.current
         conn = @connection_proc.call
         @busy_connections[fiber] = conn
-        fiber[:connection] = conn
+        fiber[connection_pool_key] = conn
       end
 
       # If a connection is available, pass it to the block, otherwise pass
@@ -79,7 +79,8 @@ module NeverBlock
         # queries in environment.rb (Root Fiber)
         return @connections.first unless fiber[:callbacks]
 
-        return fiber[:connection] if fiber[:connection]
+        fiber[:current_pool_key] = connection_pool_key
+        return fiber[connection_pool_key] if fiber[connection_pool_key]
         conn =  if !@connections.empty?
           @connections.shift
         elsif (@connections.length + @busy_connections.length) < @size
@@ -93,16 +94,16 @@ module NeverBlock
         fiber[:callbacks] << self.method(:release)
 
         @busy_connections[fiber] = conn
-        fiber[:connection] = conn
+        fiber[connection_pool_key] = conn
 			end
 
       # Give the fiber's connection back to the pool
 			def release()
         fiber = Fiber.current
-        if fiber[:connection]
+        if fiber[connection_pool_key]
 				  @busy_connections.delete(fiber)
-				  @connections << fiber[:connection]
-          fiber[:connection] = nil
+				  @connections << fiber[connection_pool_key]
+          fiber[connection_pool_key] = nil
         end
 			end
 
@@ -118,6 +119,10 @@ module NeverBlock
 				end
 			end
 			
+			def connection_pool_key
+			  @connection_pool_key ||= "connection_pool_#{object_id}".intern
+		  end
+			
 		end #FiberedConnectionPool
 		
 	end #Pool

data/lib/neverblock-pg.rb

@@ -1,5 +1,5 @@
 $:.unshift File.expand_path(File.dirname(__FILE__))
-require 'neverblock'
+#require 'neverblock'
 require 'never_block/db/fibered_db_connection'
 require 'never_block/db/pooled_db_connection'
 require 'never_block/db/fibered_postgres_connection'

data/neverblock.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "neverblock"
-  s.version  = "0.1.5"
+  s.version  = "0.1.6"
   s.date     = "2008-11-06"
   s.summary  = "Utilities for non-blocking stack components"
   s.email    = "oldmoe@gmail.com"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: espace-neverblock
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Muhammad A. Ali