eventmachine 0.12.2 → 0.12.4

data/java/src/com/rubyeventmachine/tests/TestServers.java

@@ -0,0 +1,74 @@
+/**
+ * $Id$
+ * 
+ * Author:: Francis Cianfrocca (gmail: blackhedd)
+ * Homepage::  http://rubyeventmachine.com
+ * Date:: 15 Jul 2007
+ * 
+ * See EventMachine and EventMachine::Connection for documentation and
+ * usage examples.
+ * 
+ *
+ *----------------------------------------------------------------------------
+ *
+ * Copyright (C) 2006-07 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.
+ *
+ *---------------------------------------------------------------------------
+ *
+ * 
+ */
+
+
+package com.rubyeventmachine.tests;
+
+
+import com.rubyeventmachine.*;
+import java.net.*;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.Assert;
+
+public class TestServers {
+
+	@BeforeClass
+	public static void setUpBeforeClass() throws Exception {
+	}
+
+	@AfterClass
+	public static void tearDownAfterClass() throws Exception {
+	}
+
+	@Before
+	public void setUp() throws Exception {
+	}
+
+	@After
+	public void tearDown() throws Exception {
+	}
+
+	
+ 	@Test
+	public void testBadServerAddress() {
+		final Application a = new Application();
+		a.run (new Runnable() {
+			public void run() {
+				try {
+					a.startServer(new InetSocketAddress ("100.100.100.100", 100), new DefaultConnectionFactory());
+					Assert.fail ("was supposed to throw a reactor exception");
+				} catch (EmReactorException e) {}
+				a.stop();
+			}
+		});
+	}
+}

data/java/src/com/rubyeventmachine/tests/TestTimers.java

@@ -0,0 +1,89 @@
+/**
+ * $Id$
+ * 
+ * Author:: Francis Cianfrocca (gmail: blackhedd)
+ * Homepage::  http://rubyeventmachine.com
+ * Date:: 15 Jul 2007
+ * 
+ * See EventMachine and EventMachine::Connection for documentation and
+ * usage examples.
+ * 
+ *
+ *----------------------------------------------------------------------------
+ *
+ * Copyright (C) 2006-07 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.
+ *
+ *---------------------------------------------------------------------------
+ *
+ * 
+ */
+
+
+package com.rubyeventmachine.tests;
+
+import com.rubyeventmachine.*;
+import java.io.*;
+
+import org.junit.Assert;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+
+public class TestTimers {
+
+	@BeforeClass
+	public static void setUpBeforeClass() throws Exception {
+	}
+
+	@AfterClass
+	public static void tearDownAfterClass() throws Exception {
+	}
+
+	@Before
+	public void setUp() throws Exception {
+	}
+
+	@After
+	public void tearDown() throws Exception {
+	}
+
+
+	
+	@Test
+	public final void test2() throws IOException {
+		Application a = new Application();
+		a.addTimer(0, new Timer() {
+			public void fire() {
+				application.stop();
+			}
+		});
+		a.run();
+		Assert.assertEquals (1, 1); // just to make sure the reactor halts.
+	}
+	
+	@Test
+	public final void test3() throws IOException {
+		Application a = new Application();
+		a.addTimer (0.1, new PeriodicTimer() {
+			int n = 0;
+			public void fire() {
+				n++;
+				if (n == 5)
+					application.stop();
+			}
+		});
+		a.run();
+		Assert.assertEquals(1, 1);
+	}
+}

data/lib/em/deferrable.rb

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

data/lib/em/eventable.rb

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

data/lib/em/future.rb

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

data/lib/em/messages.rb

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

data/lib/em/processes.rb

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

data/lib/em/spawnable.rb

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

data/lib/em/streamer.rb

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

data/lib/eventmachine.rb

@@ -1,4 +1,4 @@
-# $Id: eventmachine.rb 785 2008-09-15 09:46:23Z francis $
+# $Id$
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -41,36 +41,37 @@
 # string be set in order to select the pure-Ruby version.
 #
 
-=begin
-$eventmachine_library ||= nil
+
+unless defined?($eventmachine_library)
+  $eventmachine_library = ENV['EVENTMACHINE_LIBRARY'] || :cascade
+end
+$eventmachine_library = $eventmachine_library.to_sym
+
 case $eventmachine_library
 when :pure_ruby
   require 'pr_eventmachine'
 when :extension
   require 'rubyeventmachine'
-else
+when :java
+  require 'jeventmachine'
+else # :cascade
   # This is the case that most user code will take.
   # Prefer the extension if available.
   begin
-    require 'rubyeventmachine'
+    if RUBY_PLATFORM =~ /java/
+      require 'java'
+      require 'jeventmachine'
+      $eventmachine_library = :java
+    else
+      require 'rubyeventmachine'
+      $eventmachine_library = :extension
+    end
   rescue LoadError
+    warn "# EventMachine fell back to pure ruby mode" if $DEBUG
     require 'pr_eventmachine'
+    $eventmachine_library = :pure_ruby
   end
 end
-=end
-
-
-if RUBY_PLATFORM =~ /java/
-	require 'java'
-	require 'jeventmachine'
-else
-	if $eventmachine_library == :pure_ruby or ENV['EVENTMACHINE_LIBRARY'] == "pure_ruby"
-		require 'pr_eventmachine'
-	else
-		require 'rubyeventmachine'
-	end
-end
-
 
 require "eventmachine_version"
 require 'em/deferrable'
@@ -171,6 +172,11 @@ require 'shellwords'
 #
 # 
 module EventMachine
+  class FileNotFoundException < Exception; end
+  
+  class << self
+    attr_reader :threadpool
+  end
 
 
 	# EventMachine::run initializes and runs an event loop.
@@ -230,7 +236,17 @@ module EventMachine
 				(b = blk || block) and add_timer(0, b)
 				run_machine
 			ensure
-				release_machine
+			  begin
+				  release_machine
+			  ensure
+  				if @threadpool
+  				  @threadpool.each { |t| t.exit }
+  				  @threadpool.each { |t| t.kill! if t.alive? }
+  				  @threadqueue = nil
+  				  @resultqueue = nil				  
+  			  end
+  				@threadpool = nil
+				end
 				@reactor_running = false
 			end
 
@@ -368,7 +384,6 @@ module EventMachine
 	def EventMachine::cancel_timer signature
 		@timers[signature] = proc{} if @timers.has_key?(signature)
 	end
-	private_class_method :cancel_timer
 
 
   # stop_event_loop may called from within a callback method
@@ -515,7 +530,16 @@ module EventMachine
   #  }
   #  
   #
-  def EventMachine::start_server server, port, handler=nil, *args, &block
+  def EventMachine::start_server server, port=nil, handler=nil, *args, &block
+    
+    begin
+      port = Integer(port)
+    rescue ArgumentError, TypeError
+      args.unshift handler if handler
+      handler = port
+      port = nil
+    end if port
+    
     klass = if (handler and handler.is_a?(Class))
       handler
     else
@@ -528,7 +552,11 @@ module EventMachine
       raise ArgumentError, "wrong number of arguments for #{klass}#initialize (#{args.size} for #{expected})" 
     end
 
-    s = start_tcp_server server, port
+    s = if port
+          start_tcp_server server, port
+        else
+          start_unix_server server
+        end
     @acceptors[s] = [klass,args,block]
     s
   end
@@ -543,22 +571,8 @@ module EventMachine
 	  EventMachine::stop_tcp_server signature
   end
 
-  def EventMachine::start_unix_domain_server filename, handler=nil, *args, &block
-    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 = start_unix_server filename
-    @acceptors[s] = [klass,args,block]
-    s
+  def EventMachine::start_unix_domain_server filename, *args, &block
+    start_server filename, *args, &block
   end
 
   # EventMachine#connect initiates a TCP connection to a remote
@@ -658,7 +672,15 @@ module EventMachine
   # to have them behave differently with respect to post_init
   # if at all possible.
   #
-  def EventMachine::connect server, port, handler=nil, *args
+  def EventMachine::connect server, port=nil, handler=nil, *args
+    begin
+      port = Integer(port)
+    rescue ArgumentError, TypeError
+      args.unshift handler if handler
+      handler = port
+      port = nil
+    end if port
+
     klass = if (handler and handler.is_a?(Class))
       handler
     else
@@ -671,7 +693,12 @@ module EventMachine
       raise ArgumentError, "wrong number of arguments for #{klass}#initialize (#{args.size} for #{expected})"
     end
 
-    s = connect_server server, port
+    s = if port
+          connect_server server, port
+        else
+          connect_unix_server server
+        end
+
     c = klass.new s, *args
     @conns[s] = c
     block_given? and yield c
@@ -783,24 +810,8 @@ module EventMachine
 	# For making connections to Unix-domain sockets.
 	# Eventually this has to get properly documented and unified with the TCP-connect methods.
 	# Note how nearly identical this is to EventMachine#connect
-	def EventMachine::connect_unix_domain socketname, 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 = connect_unix_server socketname
-		c = klass.new s, *args
-		@conns[s] = c
-		block_given? and yield c
-		c
+	def EventMachine::connect_unix_domain socketname, *args, &blk
+	  connect socketname, *args, &blk
 	end
 
 
@@ -993,27 +1004,30 @@ module EventMachine
 	# way of initializing @threadqueue because EventMachine is a Module, not a Class, and
 	# has no constructor.
 	#
-	def self::defer op, callback = nil
-		@need_threadqueue ||= 0
-		if @need_threadqueue == 0
-			@need_threadqueue = 1
+	def self::defer op = nil, callback = nil, &blk
+		unless @threadpool
 			require 'thread'
+			@threadpool = []
 			@threadqueue = Queue.new
 			@resultqueue = Queue.new
-			20.times {|ix|
-				Thread.new {
-					my_ix = ix
-					loop {
-						op,cback = @threadqueue.pop
-						result = op.call
-						@resultqueue << [result, cback]
-						EventMachine.signal_loopbreak
-					}
-				}
-			}
+			spawn_threadpool
 		end
 
-		@threadqueue << [op,callback]
+		@threadqueue << [op||blk,callback]
+	end
+	
+	def self.spawn_threadpool
+	  until @threadpool.size == 20
+			thread = Thread.new do
+				while true
+					op, cback = *@threadqueue.pop
+					result = op.call
+					@resultqueue << [result, cback]
+					EventMachine.signal_loopbreak
+				end
+			end
+			@threadpool << thread
+		end
 	end
 
 
@@ -1090,7 +1104,7 @@ module EventMachine
 	#--
 	# Perhaps misnamed since the underlying function uses socketpair and is full-duplex.
 	#
-	def self::popen cmd, handler=nil
+	def self::popen cmd, handler=nil, *args
 		klass = if (handler and handler.is_a?(Class))
 			handler
 		else
@@ -1100,7 +1114,7 @@ module EventMachine
 		w = Shellwords::shellwords( cmd )
 		w.unshift( w.first ) if w.first
 		s = invoke_popen( w )
-		c = klass.new s
+		c = klass.new s, *args
 		@conns[s] = c
 		yield(c) if block_given?
 		c
@@ -1164,7 +1178,7 @@ module EventMachine
 		# code, but the performance impact may be too large.
 		#
 		if opcode == ConnectionData
-			c = @conns[conn_binding] or raise ConnectionNotBound
+			c = @conns[conn_binding] or raise ConnectionNotBound, "received data #{data} for unknown signature: #{conn_binding}"
 			c.receive_data data
 		elsif opcode == ConnectionUnbound
 			if c = @conns.delete( conn_binding )
@@ -1177,7 +1191,7 @@ module EventMachine
 			elsif c = @acceptors.delete( conn_binding )
 				# no-op
 			else
-				raise ConnectionNotBound
+				raise ConnectionNotBound, "recieved ConnectionUnbound for an unknown signature: #{conn_binding}"
 			end
 		elsif opcode == ConnectionAccepted
 			accep,args,blk = @acceptors[conn_binding]
@@ -1187,10 +1201,10 @@ module EventMachine
 			blk and blk.call(c)
 			c # (needed?)
 		elsif opcode == TimerFired
-			t = @timers.delete( data ) or raise UnknownTimerFired
+			t = @timers.delete( data ) or raise UnknownTimerFired, "timer data: #{data}"
 			t.call
 		elsif opcode == ConnectionCompleted
-			c = @conns[conn_binding] or raise ConnectionNotBound
+			c = @conns[conn_binding] or raise ConnectionNotBound, "received ConnectionCompleted for unknown signature: #{conn_binding}"
 			c.connection_completed
 		elsif opcode == LoopbreakSignalled
 			run_deferred_callbacks
@@ -1348,10 +1362,10 @@ class Connection
   # Override .new so subclasses don't have to call super and can ignore
   # connection-specific arguments
   #
-  def self.new sig, *args #:nodoc:
+  def self.new(sig, *args) #:nodoc:
     allocate.instance_eval do
       # Call a superclass's #initialize if it has one
-      initialize *args
+      initialize(*args)
 
       # Store signature and run #post_init
       @signature = sig
@@ -1367,6 +1381,10 @@ class Connection
 	def initialize(*args) #:nodoc:
   end
 
+	def associate_callback_target(sig) #:nodoc:
+		# no-op for the time being, to match similar no-op in rubymain.cpp
+	end
+
 	# EventMachine::Connection#post_init is called by the event loop
 	# immediately after the network connection has been established,
 	# and before resumption of the network loop.
@@ -1485,7 +1503,9 @@ class Connection
 	# connection objects. (Need an example to make that clear.)
 	#
 	def send_data data
-		EventMachine::send_data @signature, data, data.length
+	  size = data.bytesize if data.respond_to?(:bytesize)
+	  size ||= data.size
+		EventMachine::send_data @signature, data, size
 	end
 
 	# Returns true if the connection is in an error state, false otherwise.
@@ -1539,11 +1559,16 @@ class Connection
 	# behaved than the ones for raw chunks of memory.
 	#
 	def start_tls args={}
-		EventMachine::set_tls_parms(
-			@signature,
-			args[:private_key_file] || "",
-			args[:cert_chain_file] || ""
-		)
+	  priv_key, cert_chain = args.values_at(:private_key_file, :cert_chain_file)
+	  
+	  [priv_key, cert_chain].each do |file|
+	    next if file.nil? or file.empty?
+	    raise FileNotFoundException, 
+	      "Could not find #{file} for start_tls" unless File.exists? file
+    end
+		
+		EventMachine::set_tls_parms(@signature, priv_key || '', cert_chain || '')
+		
 		EventMachine::start_tls @signature
 	end
 
@@ -1685,8 +1710,10 @@ class Connection
 			EventMachine::add_timer @interval, proc {self.fire}
 		end
 		def fire
-			@code.call
-			schedule unless @cancelled
+			unless @cancelled
+				@code.call
+				schedule
+			end
 		end
 		def cancel
 			@cancelled = true
@@ -1705,42 +1732,37 @@ class Connection
 		end
 	end
 
-
-
-
 end
 
+# Is inside of protocols/ but not in the namespace?
+require 'protocols/buftok'
+
 module Protocols
 	# In this module, we define standard protocol implementations.
 	# They get included from separate source files.
+	
+	# TODO / XXX: We're munging the LOAD_PATH!
+	# A good citizen would use eventmachine/protocols/tcptest.
+	# TODO : various autotools are completely useless with the lack of naming
+	# convention, we need to correct that!
+	autoload :TcpConnectTester, 'protocols/tcptest'
+	autoload :HttpClient, 'protocols/httpclient'
+	autoload :LineAndTextProtocol, 'protocols/line_and_text'
+	autoload :HeaderAndContentProtocol, 'protocols/header_and_content'
+	autoload :LineText2, 'protocols/linetext2'
+	autoload :HttpClient2, 'protocols/httpcli2'
+	autoload :Stomp, 'protocols/stomp'
+	autoload :SmtpClient, 'protocols/smtpclient'
+	autoload :SmtpServer, 'protocols/smtpserver'
+	autoload :SASLauth, 'protocols/saslauth'
+	
+	#require 'protocols/postgres' UNCOMMENT THIS LINE WHEN THE POSTGRES CODE IS READY FOR PRIME TIME.
 end
 
 end # module EventMachine
 
-
-
 # Save everyone some typing.
 EM = EventMachine
 EM::P = EventMachine::Protocols
 
-
-# At the bottom of this module, we load up protocol handlers that depend on some
-# of the classes defined here. Eventually we should refactor this out so it's
-# laid out in a more logical way.
-#
-
-require 'protocols/tcptest'
-require 'protocols/httpclient'
-require 'protocols/line_and_text'
-require 'protocols/linetext2'
-require 'protocols/header_and_content'
-require 'protocols/httpcli2'
-require 'protocols/stomp'
-require 'protocols/smtpclient'
-require 'protocols/smtpserver'
-require 'protocols/saslauth'
-#require 'protocols/postgres' UNCOMMENT THIS LINE WHEN THE POSTGRES CODE IS READY FOR PRIME TIME.
-
 require 'em/processes'
-
-