oldmoe-neverblock 0.1.6 → 1.0

data/lib/neverblock/io/socket.rb

@@ -0,0 +1,75 @@
+# Author::    Mohammad A. Ali  (mailto:oldmoe@gmail.com)
+# Copyright:: Copyright (c) 2009 eSpace, Inc.
+# License::   Distributes under the same terms as Ruby
+
+require 'socket'
+require 'fcntl'
+require File.expand_path(File.dirname(__FILE__)+'/io')
+
+class BasicSocket < IO
+
+  @@getaddress_method = IPSocket.method(:getaddress)
+  def self.getaddress(*args)
+    @@getaddress_method.call(*args)
+  end
+
+  alias_method :recv_blocking, :recv
+
+	def recv_neverblock(*args)
+		res = ""
+		begin
+      old_flags = self.fcntl(Fcntl::F_GETFL, 0)
+			res << recv_nonblock(*args)
+      self.fcntl(Fcntl::F_SETFL, old_flags)
+		rescue Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EINTR
+      self.fcntl(Fcntl::F_SETFL, old_flags)
+  		NB.wait(:read, self)
+  		retry
+		end
+		res
+  end
+
+	def recv(*args)
+		if NB.neverblocking?
+			recv_neverblock(*args)
+    else
+      recv_blocking(*args)
+    end
+  end
+
+end
+
+class Socket < BasicSocket
+  
+	alias_method :connect_blocking, :connect
+	    
+  def connect_neverblock(server_sockaddr)
+    begin
+      connect_nonblock(server_sockaddr)
+    rescue Errno::EINPROGRESS, Errno::EINTR, Errno::EALREADY, Errno::EWOULDBLOCK
+      NB.wait(:write, self)
+			retry
+    rescue Errno::EISCONN
+      # do nothing, we are good
+    end
+  end
+    
+  def connect(server_sockaddr)
+    if NB.neverblocking?
+	  	connect_neverblock(server_sockaddr)
+    else
+      connect_blocking(server_sockaddr)
+    end
+  end
+
+end
+
+Object.send(:remove_const, :TCPSocket)
+
+class TCPSocket < Socket
+	def initialize(*args)
+    super(AF_INET, SOCK_STREAM, 0)
+    self.connect(Socket.sockaddr_in(*(args.reverse)))
+  end
+end
+

data/lib/neverblock_io.rb

@@ -0,0 +1,6 @@
+$:.unshift File.expand_path(File.dirname(__FILE__))
+
+require 'neverblock'
+#socket and file will require IO.rb in core
+require 'neverblock/io/socket'
+require 'neverblock/io/file'

data/lib/system.rb

@@ -0,0 +1,4 @@
+$:.unshift File.expand_path(File.dirname(__FILE__))
+
+require 'neverblock/core/system/system'
+require 'neverblock/core/system/timeout'

data/neverblock.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "neverblock"
-  s.version  = "0.1.6"
-  s.date     = "2008-11-06"
+  s.version  = "1.0"
+  s.date     = "2009-07-16"
   s.summary  = "Utilities for non-blocking stack components"
   s.email    = "oldmoe@gmail.com"
   s.homepage = "http://github.com/oldmoe/neverblock"
@@ -10,28 +10,30 @@ Gem::Specification.new do |s|
   s.authors  = ["Muhammad A. Ali", "Ahmed Sobhi", "Osama Brekaa"]
   s.files    = [ 
 		"neverblock.gemspec", 
-		"README", 
-		"lib/neverblock.rb", 
-		"lib/never_block.rb", 
-		"lib/neverblock-pg.rb", 
-		"lib/neverblock-mysql.rb", 
-		"lib/never_block/extensions/fiber_extensions.rb", 
-		"lib/never_block/pool/fiber_pool.rb", 
-		"lib/never_block/pool/fibered_connection_pool.rb",
-    "lib/never_block/frameworks/rails.rb",
-    "lib/never_block/frameworks/activerecord.rb",
-    "lib/never_block/servers/thin.rb",
-    "lib/never_block/servers/mongrel.rb",
-    "lib/never_block/db/fibered_postgres_connection.rb",
-    "lib/never_block/db/pooled_db_connection.rb",
-    "lib/never_block/db/fibered_mysql_connection.rb",
-    "lib/never_block/db/fibered_db_connection.rb",
-    "lib/active_record/connection_adapters/neverblock_postgresql_adapter.rb",
-    "lib/active_record/connection_adapters/neverblock_mysql_adapter.rb"
+		"README",
+                "lib/neverblock/core/reactor.rb",
+                "lib/neverblock/core/fiber.rb",
+                "lib/neverblock/core/pool.rb",
+                "lib/neverblock/core/system/system.rb",
+                "lib/neverblock/core/system/timeout.rb",
+                "lib/neverblock/io/db/pool.rb",
+                "lib/neverblock/io/db/drivers/mysql.rb",
+                "lib/neverblock/io/db/drivers/postgres.rb",
+                "lib/neverblock/io/db/connection.rb",
+                "lib/neverblock/io/db/fibered_connection_pool.rb",
+                "lib/neverblock/io/db/fibered_mysql_connection.rb",
+                "lib/neverblock/io/file.rb",
+                "lib/neverblock/io/socket.rb",
+                "lib/neverblock/io/io.rb",
+                "lib/system.rb",
+                "lib/neverblock.rb",
+                "lib/never_block.rb",
+                "lib/neverblock_io.rb"
+
   ]
   s.rdoc_options = ["--main", "README"]
   s.extra_rdoc_files = ["README"]
-  s.add_dependency('eventmachine', '>= 0.12.2')
+  s.add_dependency('reactor', '>= 0.2.3')
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oldmoe-neverblock
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: "1.0"
 platform: ruby
 authors: 
 - Muhammad A. Ali
@@ -11,17 +11,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-06 00:00:00 -08:00
+date: 2009-07-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
+  name: reactor
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.12.2
+        version: 0.2.3
     version: 
 description: NeverBlock is a collection of classes and modules that help you write evented non-blocking applications in a seemingly blocking mannner.
 email: oldmoe@gmail.com
@@ -34,25 +35,27 @@ extra_rdoc_files:
 files: 
 - neverblock.gemspec
 - README
+- lib/neverblock/core/reactor.rb
+- lib/neverblock/core/fiber.rb
+- lib/neverblock/core/pool.rb
+- lib/neverblock/core/system/system.rb
+- lib/neverblock/core/system/timeout.rb
+- lib/neverblock/io/db/pool.rb
+- lib/neverblock/io/db/drivers/mysql.rb
+- lib/neverblock/io/db/drivers/postgres.rb
+- lib/neverblock/io/db/connection.rb
+- lib/neverblock/io/db/fibered_connection_pool.rb
+- lib/neverblock/io/db/fibered_mysql_connection.rb
+- lib/neverblock/io/file.rb
+- lib/neverblock/io/socket.rb
+- lib/neverblock/io/io.rb
+- lib/system.rb
 - lib/neverblock.rb
 - lib/never_block.rb
-- lib/neverblock-pg.rb
-- lib/neverblock-mysql.rb
-- lib/never_block/extensions/fiber_extensions.rb
-- lib/never_block/pool/fiber_pool.rb
-- lib/never_block/pool/fibered_connection_pool.rb
-- lib/never_block/frameworks/rails.rb
-- lib/never_block/frameworks/activerecord.rb
-- lib/never_block/servers/thin.rb
-- lib/never_block/servers/mongrel.rb
-- lib/never_block/db/fibered_postgres_connection.rb
-- lib/never_block/db/pooled_db_connection.rb
-- lib/never_block/db/fibered_mysql_connection.rb
-- lib/never_block/db/fibered_db_connection.rb
-- lib/active_record/connection_adapters/neverblock_postgresql_adapter.rb
-- lib/active_record/connection_adapters/neverblock_mysql_adapter.rb
+- lib/neverblock_io.rb
 has_rdoc: true
 homepage: http://github.com/oldmoe/neverblock
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -74,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Utilities for non-blocking stack components

data/lib/active_record/connection_adapters/neverblock_mysql_adapter.rb

@@ -1,68 +0,0 @@
-require 'activesupport'
-require 'never_block/frameworks/activerecord'
-require 'active_record/connection_adapters/mysql_adapter'
-require 'neverblock-mysql'
-
-class ActiveRecord::ConnectionAdapters::NeverBlockMysqlAdapter < ActiveRecord::ConnectionAdapters::MysqlAdapter
-
-  # Returns 'NeverBlockMySQL' as adapter name for identification purposes
-  def adapter_name
-    'NeverBlockMySQL'
-  end
-
-  def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
-    super sql, name
-    id_value || @connection.insert_id
-  end
-
-  def update_sql(sql, name = nil) #:nodoc:
-    super
-    @connection.affected_rows
-  end
-
-  def connect
-    #initialize the connection pool
-    unless @connection
-      @connection = ::NB::DB::PooledDBConnection.new(@connection_options[0]) do
-        conn = ::NB::DB::FMysql.init
-        encoding = @config[:encoding]
-        if encoding
-          conn.options(::NB::DB::FMysql::SET_CHARSET_NAME, encoding) rescue nil
-        end
-        conn.ssl_set(@config[:sslkey], @config[:sslcert], @config[:sslca], @config[:sslcapath], @config[:sslcipher]) if @config[:sslkey]
-        conn.real_connect(*@connection_options[1..(@connection_options.length-1)])
-        NB.neverblock(false) do
-          conn.query("SET NAMES '#{encoding}'") if encoding
-          # By default, MySQL 'where id is null' selects the last inserted id.
-          # Turn this off. http://dev.rubyonrails.org/ticket/6778
-          conn.query("SET SQL_AUTO_IS_NULL=0")
-        end
-        conn
-      end
-    else  # we have a connection pool, we need to recover a connection
-      @connection.replace_acquired_connection
-    end
-  end
-
-end
-
-class ActiveRecord::Base
-  # Establishes a connection to the database that's used by all Active Record objects
-  def self.neverblock_mysql_connection(config) # :nodoc:
-    config = config.symbolize_keys
-    host     = config[:host]
-    port     = config[:port]
-    socket   = config[:socket]
-    username = config[:username] ? config[:username].to_s : 'root'
-    password = config[:password].to_s
-    size     = config[:connections] || 4
-
-    if config.has_key?(:database)
-      database = config[:database]
-    else
-      raise ArgumentError, "No database specified. Missing argument: database."
-    end
-    MysqlCompat.define_all_hashes_method!
-    ::ActiveRecord::ConnectionAdapters::NeverBlockMysqlAdapter.new(nil, logger, [size.to_i, host, username, password, database, port, socket, nil], config)
-  end  
-end

data/lib/active_record/connection_adapters/neverblock_postgresql_adapter.rb

@@ -1,85 +0,0 @@
-require 'active_record/connection_adapters/postgresql_adapter'
-require 'neverblock-pg'
-require 'never_block/frameworks/activerecord'
-
-
-class ActiveRecord::ConnectionAdapters::NeverBlockPostgreSQLAdapter < ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-      # Returns 'FiberedPostgreSQL' as adapter name for identification purposes.
-      def adapter_name
-        'NeverBlockPostgreSQL'
-      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 connect
-        @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
-          # the first string, because that could then break any transactions in progress.
-          # See: http://www.postgresql.org/docs/current/static/runtime-config-compatible.html
-          # If PostgreSQL doesn't know the standard_conforming_strings parameter then it doesn't
-          # support escape string syntax. Don't override the inherited quoted_string_prefix.
-          NB.neverblock(false) do
-            if supports_standard_conforming_strings?
-              self.class.instance_eval do
-                define_method(:quoted_string_prefix) { 'E' }
-              end
-            end
-            # Money type has a fixed precision of 10 in PostgreSQL 8.2 and below, and as of
-            # PostgreSQL 8.3 it has a fixed precision of 19. PostgreSQLColumn.extract_precision
-            # should know about this but can't detect it there, so deal with it here.
-            money_precision = (postgresql_version >= 80300) ? 19 : 10
-            ::ActiveRecord::ConnectionAdapters::PostgreSQLColumn.module_eval(<<-end_eval)
-              def extract_precision(sql_type)
-                if sql_type =~ /^money$/
-                  #{money_precision}
-                else
-                  super
-                end
-              end
-            end_eval
-            #configure_connection
-          end
-	  conn
-=end
-        end
-      end
-
-      # Close then reopen the connection.
-      def reconnect!
-        disconnect!
-        connect
-      end
-
-end
-
-class ActiveRecord::Base
-  # Establishes a connection to the database that's used by all Active Record objects
-  def self.neverblock_postgresql_connection(config) # :nodoc:
-    config = config.symbolize_keys
-    host     = config[:host]
-    port     = config[:port] || 5432
-    username = config[:username].to_s
-    password = config[:password].to_s
-    size     = config[:connections] || 4
-
-    if config.has_key?(:database)
-      database = config[:database]
-    else
-      raise ArgumentError, "No database specified. Missing argument: database."
-    end
-
-    # The postgres drivers don't allow the creation of an unconnected PGconn object,
-    # so just pass a nil connection object for the time being.
-    ::ActiveRecord::ConnectionAdapters::NeverBlockPostgreSQLAdapter.new(nil, logger, [size, host, port, nil, nil, database, username, password], config)
-  end  
-end

data/lib/never_block/db/fibered_db_connection.rb

@@ -1,72 +0,0 @@
-module NeverBlock
-  module DB
-    module FiberedDBConnection
-
-      # Attaches the connection socket to an event loop and adds a callback
-      # to the fiber's callbacks that unregisters the connection from event loop
-      # Raises NB::NBError
-      def register_with_event_loop
-        #puts ">>>>>register_with_event_loop"
-        if EM.reactor_running?
-          @fiber = Fiber.current
-          #puts ">>>>>register_with_event_loop fiber #{@fiber.inspect}"
-          # When there's no previous em_connection
-          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")
-        end
-      end  
-
-      # Unattaches the connection socket from the event loop
-      def unregister_from_event_loop
-        #puts ">>>>>unregister_from_event_loop #{self.inspect} #{@fiber.inspect}"
-        key = @fiber[:em_keys].pop
-        if em_c = @fiber[key]
-          em_c.detach
-          @fiber[key] = nil
-          true
-        else
-          false
-        end
-      end
-
-      # Removes the unregister_from_event_loop callback from the fiber's
-      # callbacks. It should be used when errors occur in an already registered
-      # connection
-      def remove_unregister_from_event_loop_callbacks
-        @fiber[:callbacks].delete self.method(:unregister_from_event_loop)
-      end
-
-      # Closes the connection using event loop
-      def event_loop_connection_close
-        key = em_connection_with_pool_key
-        @fiber[key].close_connection if @fiber[key]
-      end
-           
-      # The callback, this is called whenever
-      # there is data available at the socket
-      def resume_command
-        @fiber.resume if @fiber
-      end
-      
-      private
-      def em_connection_with_pool_key
-        "em_#{@fiber[:current_pool_key]}".intern
-      end
-    end
-    
-    module EMConnectionHandler
-      def initialize connection
-        @db_connection = connection
-      end
-      def notify_readable
-        @db_connection.resume_command
-      end
-    end
-  end
-end