oldmoe-neverblock 0.1.1 → 0.1.2

data/lib/active_record/connection_adapters/neverblock_mysql_adapter.rb

@@ -45,10 +45,12 @@ class ActiveRecord::ConnectionAdapters::NeverBlockMysqlAdapter < ActiveRecord::C
       end
       conn.ssl_set(@config[:sslkey], @config[:sslcert], @config[:sslca], @config[:sslcapath], @config[:sslcipher]) if @config[:sslkey]
       conn.real_connect(*@connection_options)
-      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")
+      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.register_with_event_loop(:em)
       conn          
     end

data/lib/active_record/connection_adapters/neverblock_postgresql_adapter.rb

@@ -41,29 +41,34 @@ class ActiveRecord::ConnectionAdapters::NeverBlockPostgreSQLAdapter < ActiveReco
         # 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.
-        @connection.begin_db_transaction
-        if supports_standard_conforming_strings?
-          self.class.instance_eval do
-            define_method(:quoted_string_prefix) { 'E' }
-          end
-        end
+        NB.neverblock(false) do
 
-        # 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
+          @connection.begin_db_transaction
+          if supports_standard_conforming_strings?
+            self.class.instance_eval do
+              define_method(:quoted_string_prefix) { 'E' }
             end
           end
-        end_eval
 
-        configure_connection
-        @connection.commit_db_transaction
+          # 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
+          @connection.commit_db_transaction
+
+        end
+
       end
 
       # Close then reopen the connection.

data/lib/never_block/db/fibered_postgres_connection.rb

@@ -22,7 +22,7 @@ module NeverBlock
         super(*args)
         @fd = socket
         @io = IO.new(socket)
-        setnonblocking(true)	
+        #setnonblocking(true)
       end
         
       # Assuming the use of NeverBlock fiber extensions and that the exec is run in
@@ -76,7 +76,7 @@ module NeverBlock
       def process_command
         # make sure all commands are sent
         # before attempting to read
-        return unless self.flush
+        #return unless self.flush
         self.consume_input
         unless is_busy		
           res, data = 0, []

data/lib/never_block/frameworks/rails.rb

@@ -1,5 +1,6 @@
+require 'neverblock' unless defined?(NeverBlock)
 #require 'actionpack'
-require 'action_controller'
+#require 'action_controller'
 
 # Rails tries to protect dispatched actions
 # by wrapping them in a synchronized code
@@ -8,6 +9,8 @@ require 'action_controller'
 # transform it (without it knowing) to
 # something more subtle
 
+
+=begin
 class ActionController::Dispatcher
 
   # let's show this guard who is
@@ -20,3 +23,15 @@ class ActionController::Dispatcher
     block.call
   end
 end
+=end
+
+
+require 'thread'
+
+# now you synchronize
+class Mutex
+  def synchronize(&block)
+    # now you don't!
+    block.call
+  end
+end

data/lib/never_block/servers/thin.rb

@@ -1,3 +1,5 @@
+require 'rubygems'
+require 'neverblock' unless defined?(NeverBlock)
 require 'thin'
 
 module Thin
@@ -8,7 +10,7 @@ module Thin
   # in fibers
   class Server
 
-    DEFAULT_FIBER_POOL_SIZE = 50
+    DEFAULT_FIBER_POOL_SIZE = 20
 
     def fiber_pool
       @fiber_pool ||= NB::Pool::FiberPool.new(DEFAULT_FIBER_POOL_SIZE)
@@ -31,16 +33,5 @@ module Thin
     
   end # Connection
 
-  module Backends
-    class Base
-      def config
-        # EM.epoll
-        # Set the maximum number of socket descriptors that the server may open.
-        # The process needs to have required privilege to set it higher the 1024 on
-        # some systems.
-        @maximum_connections = EventMachine.set_descriptor_table_size(@maximum_connections) unless Thin.win?
-      end
-    end
-  end # Backends
 
 end # Thin

data/lib/never_block.rb

@@ -73,6 +73,12 @@ require 'never_block/pool/fiber_pool'
 require 'never_block/pool/fibered_connection_pool'
 
 module NeverBlock
+  def self.neverblock(nb = true, &block)
+    status = Fiber.current[:neverblock]
+    Fiber.current[:neverblock] = nb
+    block.call
+    Fiber.current[:neverblock] = status
+  end
 end
 
 NB = NeverBlock

data/neverblock.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "neverblock"
-  s.version  = "0.1.1"
-  s.date     = "2008-08-13"
+  s.version  = "0.1.2"
+  s.date     = "2008-09-04"
   s.summary  = "Utilities for non-blocking stack components"
   s.email    = "oldmoe@gmail.com"
   s.homepage = "http://github.com/oldmoe/neverblock"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oldmoe-neverblock
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Muhammad A. Ali
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 -07:00
+date: 2008-09-04 00:00:00 -07:00
 default_executable: 
 dependencies: []