espace-neverblock 0.1.2 → 0.1.3

data/lib/never_block/db/pooled_fibered_mysql_connection.rb

@@ -14,29 +14,28 @@ module NeverBlock
         end
       end
       
-      # A proxy for the connection's exec method
+      # A proxy for the connection's query method
       # quries the pool to get a connection first
-      def exec(query)
+      def query(query)
         @pool.hold do |conn|
           conn.query(query)
         end
       end
       
-      alias :query :exec
       # This method must be called for transactions to work correctly.
       # One cannot just send "begin" as you never know which connection
       # will be available next. This method ensures you get the same connection
       # while in a transaction.
       def begin_db_transaction
         @pool.hold(true) do |conn|
-          conn.exec("begin")
+          conn.query("begin")
         end
       end
       
       # see =begin_db_transaction
       def rollback_db_transaction
         @pool.hold do |conn|
-          conn.exec("rollback")
+          conn.query("rollback")
           @pool.release(Fiber.current,conn)
         end
       end
@@ -44,7 +43,7 @@ module NeverBlock
       # see =begin_db_transaction
       def commit_db_transaction
         @pool.hold do |conn|
-          conn.exec("commit")
+          conn.query("commit")
           @pool.release(Fiber.current,conn)
         end
       end

data/lib/never_block/frameworks/rails.rb

@@ -1,6 +1,4 @@
 require 'neverblock' unless defined?(NeverBlock)
-#require 'actionpack'
-#require 'action_controller'
 
 # Rails tries to protect dispatched actions
 # by wrapping them in a synchronized code
@@ -9,29 +7,59 @@ require 'neverblock' unless defined?(NeverBlock)
 # transform it (without it knowing) to
 # something more subtle
 
-
-=begin
-class ActionController::Dispatcher
-
-  # let's show this guard who is
-  # the man of the house
-  @@guard = Object.new
-
-  # now you synchronize
-  def @@guard.synchronize(&block)
+require 'thread'
+# now you synchronize
+class Mutex
+  def synchronize(&block)
     # now you don't!
     block.call
   end
 end
-=end
 
+require 'action_controller'
+class ActionController::Base
 
-require 'thread'
+  # Mark some actions to execute in a blocking manner overriding the default
+  # settings.
+  # Example:
+  #   class UsersController < ApplicationController
+  #     .
+  #     allowblock :index
+  #     .
+  #   end
+  def self.allowblock(*actions)
+    actions.each do |action|
+      class_eval <<-"end_eval"
+        def allowblock_#{action}
+          status = Fiber.current[:neverblock]
+          Fiber.current[:neverblock] = false
+          yield
+          Fiber.current[:neverblock] = status
+        end
+        around_filter :allowblock_#{action}, :only => [:#{action}]
+      end_eval
+    end
+  end
 
-# now you synchronize
-class Mutex
-  def synchronize(&block)
-    # now you don't!
-    block.call
+  # Mark some actions to execute in a non-blocking manner overriding the default
+  # settings.
+  # Example:
+  #   class UsersController < ApplicationController
+  #     .
+  #     allowblock :index
+  #     .
+  #   end
+  def self.neverblock(*actions)
+    actions.each do |action|
+      class_eval <<-"end_eval"
+        def neverblock_#{action}
+          status = Fiber.current[:neverblock]
+          Fiber.current[:neverblock] = true
+          yield
+          Fiber.current[:neverblock] = status
+        end
+        around_filter :allowblock_#{action}, :only => [:#{action}]
+      end_eval
+    end
   end
 end

data/lib/never_block/servers/mongrel.rb

@@ -0,0 +1,236 @@
+# This module rewrites pieces of the very good Mongrel web server in
+# order to change it from a threaded application to an event based
+# application running inside an EventMachine event loop.  It should
+# be compatible with the existing Mongrel handlers for Rails,
+# Camping, Nitro, etc....
+
+# NeverBlock support added
+
+begin
+	load_attempted ||= false
+	require 'eventmachine'
+rescue LoadError
+	unless load_attempted
+		load_attempted = true
+		require 'rubygems'
+		retry
+	end
+end
+
+require 'rubygems'
+require 'neverblock'
+require 'mongrel'
+
+module Mongrel
+	class MongrelProtocol < EventMachine::Connection
+		def post_init
+			@parser = HttpParser.new
+			@params = HttpParams.new
+			@nparsed = 0
+			@request = nil
+			@request_len = nil
+			@linebuffer = ''
+		end
+
+		def receive_data data
+			@linebuffer << data
+			@nparsed = @parser.execute(@params, @linebuffer, @nparsed) unless @parser.finished?
+			if @parser.finished?
+				if @request_len.nil?
+					@request_len = @params[::Mongrel::Const::CONTENT_LENGTH].to_i
+					script_name, path_info, handlers = ::Mongrel::HttpServer::Instance.classifier.resolve(@params[::Mongrel::Const::REQUEST_PATH])
+					if handlers
+						@params[::Mongrel::Const::PATH_INFO] = path_info
+						@params[::Mongrel::Const::SCRIPT_NAME] = script_name
+						@params[::Mongrel::Const::REMOTE_ADDR] = @params[::Mongrel::Const::HTTP_X_FORWARDED_FOR] || ::Socket.unpack_sockaddr_in(get_peername)[1]
+						@notifiers = handlers.select { |h| h.request_notify }
+					end
+					if @request_len > ::Mongrel::Const::MAX_BODY
+						new_buffer = Tempfile.new(::Mongrel::Const::MONGREL_TMP_BASE)
+						new_buffer.binmode
+						new_buffer << @linebuffer[@nparsed..-1]
+						@linebuffer = new_buffer
+					else
+						@linebuffer = StringIO.new(@linebuffer[@nparsed..-1])
+						@linebuffer.pos = @linebuffer.length
+					end
+				end
+				if @linebuffer.length >= @request_len
+					@linebuffer.rewind
+					::Mongrel::HttpServer::Instance.process_http_request(@params,@linebuffer,self)
+					@linebuffer.delete if Tempfile === @linebuffer
+				end
+			elsif @linebuffer.length > ::Mongrel::Const::MAX_HEADER
+				close_connection
+				raise ::Mongrel::HttpParserError.new("HEADER is longer than allowed, aborting client early.")
+			end
+		rescue ::Mongrel::HttpParserError
+			if $mongrel_debug_client
+				STDERR.puts "#{Time.now}: BAD CLIENT (#{params[Const::HTTP_X_FORWARDED_FOR] || client.peeraddr.last}): #$!"
+				STDERR.puts "#{Time.now}: REQUEST DATA: #{data.inspect}\n---\nPARAMS: #{params.inspect}\n---\n"
+			end
+			close_connection
+		rescue Exception => e
+			close_connection
+			raise e
+		end
+
+		def write data
+			send_data data
+		end
+
+		def closed?
+			false
+		end
+
+	end
+
+	class HttpServer
+    DEFAULT_FIBER_POOL_SIZE = 20
+		def initialize(host, port, num_processors=950, x=0, y=nil) # Deal with Mongrel 1.0.1 or earlier, as well as later.
+			@socket = nil
+			@classifier = URIClassifier.new
+			@host = host
+			@port = port
+			@workers = ThreadGroup.new
+			if y
+				@throttle = x
+				@timeout = y || 60
+			else
+				@timeout = x
+			end
+			@num_processors = num_processors #num_processors is pointless for evented....
+			@death_time = 60
+			self.class.const_set(:Instance,self)
+		end
+
+    def fiber_pool
+      @fiber_pool ||= NB::Pool::FiberPool.new(DEFAULT_FIBER_POOL_SIZE)
+    end
+
+		def run
+			trap('INT') { raise StopServer }
+			trap('TERM') { raise StopServer }
+			@acceptor = Thread.new do
+				EventMachine.epoll
+				EventMachine.set_descriptor_table_size(4096)
+				EventMachine.run do
+					begin
+						EventMachine.start_server(@host,@port,MongrelProtocol)
+					rescue StopServer
+						EventMachine.stop_event_loop
+					end
+				end
+			end
+		end
+
+		def process_http_request(params,linebuffer,client)
+			if not params[Const::REQUEST_PATH]
+				uri = URI.parse(params[Const::REQUEST_URI])
+				params[Const::REQUEST_PATH] = uri.request_uri
+			end
+
+      raise "No REQUEST PATH" if not params[Const::REQUEST_PATH]
+
+			script_name, path_info, handlers = @classifier.resolve(params[Const::REQUEST_PATH])
+
+			if handlers
+				notifiers = handlers.select { |h| h.request_notify }
+				request = HttpRequest.new(params, linebuffer, notifiers)
+
+				# request is good so far, continue processing the response
+				response = HttpResponse.new(client)
+
+				# Process each handler in registered order until we run out or one finalizes the response.
+				fiber_pool.spawn do
+				  dispatch_to_handlers(handlers,request,response)
+        end
+				# And finally, if nobody closed the response off, we finalize it.
+				unless response.done
+					response.finished
+				else
+					response.close_connection_after_writing
+				end
+			else
+				# Didn't find it, return a stock 404 response.
+				client.send_data(Const::ERROR_404_RESPONSE)
+				client.close_connection_after_writing
+			end
+		end
+
+		def dispatch_to_handlers(handlers,request,response)
+			handlers.each do |handler|
+				handler.process(request, response)
+				break if response.done
+			end
+		end
+	end
+
+	class HttpRequest
+		def initialize(params, linebuffer, dispatchers)
+			@params = params
+			@dispatchers = dispatchers
+			@body = linebuffer
+		end
+	end
+
+	class HttpResponse
+		def send_file(path, small_file = false)
+			File.open(path, "rb") do |f|
+				while chunk = f.read(Const::CHUNK_SIZE) and chunk.length > 0
+					begin
+						write(chunk)
+					rescue Object => exc
+						break
+					end
+				end
+			end
+			@body_sent = true
+		end
+
+		def write(data)
+			@socket.send_data data
+		end
+
+		def close_connection_after_writing
+			@socket.close_connection_after_writing
+		end
+
+		def socket_error(details)
+			@socket.close_connection
+			done = true
+			raise details
+		end
+
+		def finished
+			send_status
+			send_header
+			send_body
+			@socket.close_connection_after_writing
+		end
+	end
+
+	class Configurator
+		# This version fixes a bug in the regular Mongrel version by adding
+		# initialization of groups.
+		def change_privilege(user, group)
+			if user and group
+				log "Initializing groups for {#user}:{#group}."
+				Process.initgroups(user,Etc.getgrnam(group).gid)
+			end
+
+			if group
+				log "Changing group to #{group}."
+				Process::GID.change_privilege(Etc.getgrnam(group).gid)
+			end
+
+			if user
+				log "Changing user to #{user}."
+				Process::UID.change_privilege(Etc.getpwnam(user).uid)
+			end
+		rescue Errno::EPERM
+			log "FAILED to change user:group #{user}:#{group}: #$!"
+			exit 1
+		end
+	end
+end

data/neverblock.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "neverblock"
-  s.version  = "0.1.2"
+  s.version  = "0.1.3"
   s.date     = "2008-09-04"
   s.summary  = "Utilities for non-blocking stack components"
   s.email    = "oldmoe@gmail.com"
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
     "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_fibered_postgres_connection.rb",
     "lib/never_block/db/fibered_mysql_connection.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: espace-neverblock
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Muhammad A. Ali
@@ -36,6 +36,7 @@ files:
 - 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_fibered_postgres_connection.rb
 - lib/never_block/db/fibered_mysql_connection.rb