eventmachine 0.10.0 → 0.12.0

data/ext/ssl.cpp

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: ssl.cpp 574 2007-11-19 23:36:04Z blackhedd $
+$Id: ssl.cpp 673 2008-01-05 04:33:01Z blackhedd $
 
 File:     ssl.cpp
 Date:     30Apr06
@@ -370,6 +370,9 @@ int SslBox_t::PutPlaintext (const char *buf, int bufsize)
 
 	OutboundQ.Push (buf, bufsize);
 
+	if (!SSL_is_init_finished (pSSL))
+		return 0;
+
 	bool fatal = false;
 	bool did_work = false;
 

data/ext/ssl.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-$Id: ssl.h 498 2007-08-15 14:03:32Z blackhedd $
+$Id: ssl.h 668 2008-01-04 23:00:34Z blackhedd $
 
 File:     ssl.h
 Date:     30Apr06

data/lib/em/deferrable.rb

@@ -1,4 +1,4 @@
-# $Id: deferrable.rb 534 2007-09-15 23:06:15Z blackhedd $
+# $Id: deferrable.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/em/eventable.rb

@@ -1,4 +1,4 @@
-# $Id: eventable.rb 320 2007-05-22 22:12:59Z blackhedd $
+# $Id: eventable.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/em/future.rb

@@ -1,4 +1,4 @@
-# $Id: future.rb 320 2007-05-22 22:12:59Z blackhedd $
+# $Id: future.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/em/messages.rb

@@ -1,4 +1,4 @@
-# $Id: messages.rb 349 2007-06-04 17:10:17Z blackhedd $
+# $Id: messages.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/em/processes.rb

@@ -0,0 +1,68 @@
+# $Id: processes.rb 668 2008-01-04 23:00:34Z blackhedd $
+#
+# Author:: Francis Cianfrocca (gmail: blackhedd)
+# Homepage::  http://rubyeventmachine.com
+# Date:: 13 Dec 07
+# 
+# See EventMachine and EventMachine::Connection for documentation and
+# usage examples.
+#
+#----------------------------------------------------------------------------
+#
+# Copyright (C) 2006-08 by Francis Cianfrocca. All Rights Reserved.
+# Gmail: blackhedd
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of either: 1) the GNU General Public License
+# as published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version; or 2) Ruby's License.
+# 
+# See the file COPYING for complete licensing information.
+#
+#---------------------------------------------------------------------------
+#
+# 
+
+
+module EventMachine
+
+	# EM::DeferrableChildProcess is a sugaring of a common use-case
+	# involving EM::popen.
+	# Call the #open method on EM::DeferrableChildProcess, passing
+	# a command-string. #open immediately returns an EM::Deferrable
+	# object. It also schedules the forking of a child process, which
+	# will execute the command passed to #open.
+	# When the forked child terminates, the Deferrable will be signalled
+	# and execute its callbacks, passing the data that the child process
+	# wrote to stdout.
+	#
+	class DeferrableChildProcess < EventMachine::Connection
+		include EventMachine::Deferrable
+
+		# Sugars a common use-case involving forked child processes.
+		# #open takes a String argument containing an shell command
+		# string (including arguments if desired). #open immediately
+		# returns an EventMachine::Deferrable object, without blocking.
+		#
+		# It also invokes EventMachine#popen to run the passed-in
+		# command in a forked child process.
+		#
+		# When the forked child terminates, the Deferrable that
+		# #open calls its callbacks, passing the data returned
+		# from the child process.
+		#
+		def self.open cmd
+			EventMachine.popen( cmd, DeferrableChildProcess )
+		end
+
+		def receive_data data
+			(@data ||= []) << data
+		end
+
+		def unbind
+			succeed( @data.join )
+		end
+	end
+end
+
+

data/lib/em/spawnable.rb

@@ -1,4 +1,4 @@
-# $Id: spawnable.rb 530 2007-09-13 01:11:38Z blackhedd $
+# $Id: spawnable.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/em/streamer.rb

@@ -1,4 +1,4 @@
-# $Id: streamer.rb 599 2007-12-05 14:24:11Z blackhedd $
+# $Id: streamer.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/eventmachine.rb

@@ -1,4 +1,4 @@
-# $Id: eventmachine.rb 594 2007-12-05 11:41:39Z blackhedd $
+# $Id: eventmachine.rb 688 2008-05-15 23:44:39Z francis $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -173,60 +173,60 @@ require 'shellwords'
 module EventMachine
 
 
-    # EventMachine::run initializes and runs an event loop.
-    # This method only returns if user-callback code calls stop_event_loop.
-    # Use the supplied block to define your clients and servers.
-    # The block is called by EventMachine::run immediately after initializing
-    # its internal event loop but <i>before</i> running the loop.
-    # Therefore this block is the right place to call start_server if you
-    # want to accept connections from remote clients.
-    #
-    # For programs that are structured as servers, it's usually appropriate
-    # to start an event loop by calling EventMachine::run, and let it
-    # run forever. It's also possible to use EventMachine::run to make a single
-    # client-connection to a remote server, process the data flow from that
-    # single connection, and then call stop_event_loop to force EventMachine::run
-    # to return. Your program will then continue from the point immediately
-    # following the call to EventMachine::run.
-    #
-    # You can of course do both client and servers simultaneously in the same program.
-    # One of the strengths of the event-driven programming model is that the
-    # handling of network events on many different connections will be interleaved,
-    # and scheduled according to the actual events themselves. This maximizes
-    # efficiency.
-    #
-    # === Server usage example
-    #
-    # See the text at the top of this file for an example of an echo server.
-    #
-    # === Client usage example
-    #
-    # See the description of stop_event_loop for an extremely simple client example.
-    #
-    #--
-    # Obsoleted the use_threads mechanism.
-    # 25Nov06: Added the begin/ensure block. We need to be sure that release_machine
-    # gets called even if an exception gets thrown within any of the user code
-    # that the event loop runs. The best way to see this is to run a unit
-    # test with two functions, each of which calls EventMachine#run and each of
-    # which throws something inside of #run. Without the ensure, the second test
-    # will start without release_machine being called and will immediately throw
-    # a C++ runtime error.
-    #
-    def EventMachine::run &block
-	@conns = {}
-	@acceptors = {}
-	@timers = {}
-	begin
-	    @reactor_running = true
-	    initialize_event_machine
-	    block and add_timer 0, block
-	    run_machine
-	ensure
-	    release_machine
-	    @reactor_running = false
+	# EventMachine::run initializes and runs an event loop.
+	# This method only returns if user-callback code calls stop_event_loop.
+	# Use the supplied block to define your clients and servers.
+	# The block is called by EventMachine::run immediately after initializing
+	# its internal event loop but <i>before</i> running the loop.
+	# Therefore this block is the right place to call start_server if you
+	# want to accept connections from remote clients.
+	#
+	# For programs that are structured as servers, it's usually appropriate
+	# to start an event loop by calling EventMachine::run, and let it
+	# run forever. It's also possible to use EventMachine::run to make a single
+	# client-connection to a remote server, process the data flow from that
+	# single connection, and then call stop_event_loop to force EventMachine::run
+	# to return. Your program will then continue from the point immediately
+	# following the call to EventMachine::run.
+	#
+	# You can of course do both client and servers simultaneously in the same program.
+	# One of the strengths of the event-driven programming model is that the
+	# handling of network events on many different connections will be interleaved,
+	# and scheduled according to the actual events themselves. This maximizes
+	# efficiency.
+	#
+	# === Server usage example
+	#
+	# See the text at the top of this file for an example of an echo server.
+	#
+	# === Client usage example
+	#
+	# See the description of stop_event_loop for an extremely simple client example.
+	#
+	#--
+	# Obsoleted the use_threads mechanism.
+	# 25Nov06: Added the begin/ensure block. We need to be sure that release_machine
+	# gets called even if an exception gets thrown within any of the user code
+	# that the event loop runs. The best way to see this is to run a unit
+	# test with two functions, each of which calls EventMachine#run and each of
+	# which throws something inside of #run. Without the ensure, the second test
+	# will start without release_machine being called and will immediately throw
+	# a C++ runtime error.
+	#
+	def EventMachine::run &block
+		@conns = {}
+		@acceptors = {}
+		@timers = {}
+		begin
+			@reactor_running = true
+			initialize_event_machine
+			block and add_timer 0, block
+			run_machine
+		ensure
+			release_machine
+			@reactor_running = false
+		end
 	end
-    end
 
 
     # Sugars a common use case. Will pass the given block to #run, but will terminate
@@ -919,6 +919,7 @@ module EventMachine
 		@threadqueue << [op,callback]
 	end
 
+
   	# Schedules a proc for execution immediately after the next "turn" through the reactor
 	# core. An advanced technique, this can be useful for improving memory management and/or
 	# application responsiveness, especially when scheduling large amounts of data for
@@ -1027,15 +1028,21 @@ module EventMachine
 	# (Experimental)
 	#
 	#
-	def EventMachine::open_keyboard handler=nil
+	def EventMachine::open_keyboard handler=nil, *args
 		klass = if (handler and handler.is_a?(Class))
 			handler
 		else
 			Class.new( Connection ) {handler and include handler}
 		end
 
+		arity = klass.instance_method(:initialize).arity
+		expected = arity >= 0 ? arity : -(arity + 1)
+		if (arity >= 0 and args.size != expected) or (arity < 0 and args.size < expected)
+			raise ArgumentError, "wrong number of arguments for #{klass}#initialize (#{args.size} for #{expected})"
+		end
+
 		s = read_keyboard
-		c = klass.new s
+		c = klass.new s, *args
 		@conns[s] = c
 		block_given? and yield c
 		c
@@ -1045,6 +1052,42 @@ module EventMachine
 
 	private
 	def EventMachine::event_callback conn_binding, opcode, data
+		#
+		# Changed 27Dec07: Eliminated the hookable error handling.
+		# No one was using it, and it degraded performance significantly.
+		# It's in original_event_callback, which is dead code.
+		#
+		if opcode == ConnectionData
+			c = @conns[conn_binding] or raise ConnectionNotBound
+			c.receive_data data
+		elsif opcode == ConnectionUnbound
+			if c = @conns.delete( conn_binding )
+				c.unbind
+			elsif c = @acceptors.delete( conn_binding )
+				# no-op
+			else
+				raise ConnectionNotBound
+			end
+		elsif opcode == ConnectionAccepted
+			accep,args,blk = @acceptors[conn_binding]
+			raise NoHandlerForAcceptedConnection unless accep
+			c = accep.new data, *args
+			@conns[data] = c
+			blk and blk.call(c)
+			c # (needed?)
+		elsif opcode == TimerFired
+			t = @timers.delete( data ) or raise UnknownTimerFired
+			t.call
+		elsif opcode == ConnectionCompleted
+			c = @conns[conn_binding] or raise ConnectionNotBound
+			c.connection_completed
+		elsif opcode == LoopbreakSignalled
+			run_deferred_callbacks
+		end
+	end
+
+	private
+	def EventMachine::original_event_callback conn_binding, opcode, data
 		#
 		# Added 03Oct07: Any code path that invokes user-written code must
 		# wrap itself in a begin/rescue for RuntimeErrors, that calls the
@@ -1195,11 +1238,8 @@ class Connection
 
       # Store signature and run #post_init
       @signature = sig
-      begin
-        post_init
-      rescue
-        EventMachine::handle_runtime_error
-      end
+      associate_callback_target sig
+      post_init
     
       self
     end
@@ -1421,6 +1461,15 @@ class Connection
 		EventMachine::get_peername @signature
 	end
 
+	# #get_sockname is used with stream-connections to obtain the identity
+	# of the local side of the connection. If a local name is available, this method
+	# returns a sockaddr structure. The method returns nil if no local name is available.
+	# You can use Socket#unpack_sockaddr_in and its variants to obtain the
+	# values contained in the local-name structure returned from #get_sockname.
+	def get_sockname
+		EventMachine::get_sockname @signature
+	end
+
 	# Returns the PID (kernel process identifier) of a subprocess
 	# associated with this Connection object. For use with EventMachine#popen
 	# and similar methods. Returns nil when there is no meaningful subprocess.
@@ -1503,6 +1552,7 @@ class Connection
 	#
 	#
 	class EventMachine::PeriodicTimer
+		attr_accessor :interval
 		def initialize *args, &block
 			@interval = args.shift
 			@code = args.shift || block
@@ -1512,11 +1562,7 @@ class Connection
 			EventMachine::add_timer @interval, proc {self.fire}
 		end
 		def fire
-			begin
-				@code.call
-			rescue
-				EventMachine::handle_runtime_error
-			end
+			@code.call
 			schedule unless @cancelled
 		end
 		def cancel
@@ -1571,5 +1617,6 @@ require 'protocols/smtpclient'
 require 'protocols/smtpserver'
 require 'protocols/saslauth'
 
+require 'em/processes'
 
 

data/lib/eventmachine_version.rb

@@ -1,4 +1,4 @@
-# $Id: eventmachine_version.rb 608 2007-12-09 21:04:39Z blackhedd $
+# $Id: eventmachine_version.rb 686 2008-05-14 21:21:10Z francis $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -25,7 +25,7 @@
 
 module EventMachine
 
-  VERSION = "0.10.0"
+  VERSION = "0.12.0"
 
 end
 

data/lib/evma.rb

@@ -1,4 +1,4 @@
-# $Id: evma.rb 319 2007-05-22 22:11:18Z blackhedd $
+# $Id: evma.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/evma/callback.rb

@@ -1,4 +1,4 @@
-# $Id: callback.rb 321 2007-05-22 22:15:04Z blackhedd $
+# $Id: callback.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/evma/container.rb

@@ -1,4 +1,4 @@
-# $Id: container.rb 321 2007-05-22 22:15:04Z blackhedd $
+# $Id: container.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/evma/factory.rb

@@ -1,4 +1,4 @@
-# $Id: factory.rb 321 2007-05-22 22:15:04Z blackhedd $
+# $Id: factory.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/evma/protocol.rb

@@ -1,4 +1,4 @@
-# $Id: protocol.rb 321 2007-05-22 22:15:04Z blackhedd $
+# $Id: protocol.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com

data/lib/evma/reactor.rb

@@ -1,4 +1,4 @@
-# $Id: reactor.rb 321 2007-05-22 22:15:04Z blackhedd $
+# $Id: reactor.rb 668 2008-01-04 23:00:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com