eventmachine 0.7.2 → 0.8.0

data/lib/eventmachine_version.rb

@@ -1,4 +1,4 @@
-# $Id: eventmachine_version.rb 324 2007-05-22 22:43:35Z blackhedd $
+# $Id: eventmachine_version.rb 389 2007-06-25 02:07:04Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -25,7 +25,7 @@
 
 module EventMachine
 
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 
 end
 

data/lib/protocols/buftok.rb

@@ -75,6 +75,11 @@ class BufferedTokenizer
     # and add it to our list of discovered entities.
     entities.unshift @input.join
 
+=begin
+	# Note added by FC, 10Jul07. This paragraph contains a regression. It breaks
+	# empty tokens. Think of the empty line that delimits an HTTP header. It will have
+	# two "\n" delimiters in a row, and this code mishandles the resulting empty token.
+	# It someone figures out how to fix the problem, we can re-enable this code branch.
     # Multi-character token support.
     # Split any tokens that were incomplete on the last iteration buf complete now.
     entities.map! do |e|
@@ -88,6 +93,7 @@ class BufferedTokenizer
     else
       entities.flatten!
     end
+=end
 
     # Now that we've hit a token, joined the input buffer and added it to the entities
     # list, we can go ahead and clear the input buffer.  All of the segments that were

data/lib/protocols/httpclient.rb

@@ -1,4 +1,4 @@
-# $Id: httpclient.rb 322 2007-05-22 22:18:35Z blackhedd $
+# $Id: httpclient.rb 398 2007-07-11 02:46:22Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -120,8 +120,9 @@ class HttpClient < Connection
     raise "oversized content in HTTP POST" if postcontent.length > MaxPostContentLength
 
     # ESSENTIAL for the request's line-endings to be CRLF, not LF. Some servers misbehave otherwise.
+    # TODO: We ASSUME the caller wants to send a 1.1 request. May not be a good assumption.
     req = [
-      "#{verb} #{request}#{qs} HTTP/1.0",
+      "#{verb} #{request}#{qs} HTTP/1.1",
       "Host: #{host}:#{port}",
       "User-agent: Ruby EventMachine",
     ]

data/lib/protocols/line_and_text.rb

@@ -1,4 +1,4 @@
-# $Id: line_and_text.rb 322 2007-05-22 22:18:35Z blackhedd $
+# $Id: line_and_text.rb 380 2007-06-13 19:10:15Z tarcieri $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -39,7 +39,9 @@ module EventMachine
       def receive_data data
         if @lbp_mode == :lines
           begin
-            @lpb_buffer.extract(data).each { |line| receive_line(line) if respond_to?(:receive_line) }
+            @lpb_buffer.extract(data).each do |line| 
+              receive_line(line.chomp) if respond_to?(:receive_line)
+            end
           rescue Exception
             receive_error('overlength line') if respond_to?(:receive_error)
             close_connection

data/tests/test_epoll.rb

@@ -0,0 +1,154 @@
+# $Id: test_epoll.rb 373 2007-06-08 16:09:01Z blackhedd $
+#
+# Author:: Francis Cianfrocca (gmail: blackhedd)
+# Homepage::  http://rubyeventmachine.com
+# Date:: 8 April 2006
+# 
+# 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.
+#
+#---------------------------------------------------------------------------
+#
+#
+#
+# TODO, and I know this doesn't belong here, but if a datagram calls
+# send_data outside of a receive_data, there is no return address, and
+# the result is a very confusing error message.
+#
+
+$:.unshift "../lib"
+require 'eventmachine'
+
+
+
+class TestEpoll < Test::Unit::TestCase
+
+	def setup
+	end
+
+	def teardown
+	end
+
+
+	module TestEchoServer
+		def receive_data data
+			send_data data
+			close_connection_after_writing
+		end
+	end
+
+	module TestEchoClient
+		def connection_completed
+			send_data "ABCDE"
+			$max += 1
+		end
+		def receive_data data
+			raise "bad response" unless data == "ABCDE"
+		end
+		def unbind
+			$n -= 1
+			EM.stop if $n == 0
+		end
+	end
+
+
+	# We can set the rlimit/nofile of a process but we can only set it
+	# higher if we're running as root.
+	# On most systems, the default value is 1024.
+	def test_rlimit
+		a = EM.set_descriptor_table_size
+		assert( a <= 1024 )
+		a = EM.set_descriptor_table_size( 1024 )
+		assert( a == 1024 )
+	end
+
+	# Run a high-volume version of this test by kicking the number of connections
+	# up past 512. (Each connection uses two sockets, a client and a server.)
+	# (Will require running the test as root)
+	# This test exercises TCP clients and servers.
+	#
+	def test_descriptors
+		EM.epoll
+		s = EM.set_descriptor_table_size 60000
+		EM.run {
+			EM.start_server "127.0.0.1", 9800, TestEchoServer
+			$n = 0
+			$max = 0
+			100.times {
+				EM.connect("127.0.0.1", 9800, TestEchoClient) {$n += 1}
+			}
+		}
+		assert_equal(0, $n)
+		assert_equal(100, $max)
+	end
+
+	def test_defer
+		$n = 0
+		EM.epoll
+		EM.run {
+			sleep_proc = proc {sleep 1}
+			return_proc = proc {$n += 1; EM.stop}
+			EM.defer sleep_proc, return_proc
+		}
+		assert_equal( 1, $n )
+	end
+
+
+	module TestDatagramServer
+		def receive_data dgm
+			$in = dgm
+			send_data "abcdefghij"
+		end
+	end
+	module TestDatagramClient
+		def post_init
+			send_datagram "1234567890", "127.0.0.1", 9500
+		end
+		def receive_data dgm
+			$out = dgm
+			EM.stop
+		end
+	end
+
+	def test_datagrams
+		$in = $out = ""
+		EM.epoll
+		EM.run {
+			EM.open_datagram_socket "127.0.0.1", 9500, TestDatagramServer
+			EM.open_datagram_socket "127.0.0.1", 0, TestDatagramClient
+		}
+		assert_equal( "1234567890", $in )
+		assert_equal( "abcdefghij", $out )
+	end
+
+
+
+
+	def test_unix_domain
+		EM.epoll
+		s = EM.set_descriptor_table_size 60000
+		EM.run {
+			EM.start_unix_domain_server "./xxx.chain", TestEchoServer
+			$n = 0
+			$max = 0
+			100.times {
+				EM.connect_unix_domain("./xxx.chain", TestEchoClient) {$n += 1}
+			}
+		}
+		assert_equal(0, $n)
+		assert_equal(100, $max)
+	end
+
+end

data/tests/test_eventables.rb

@@ -1,4 +1,4 @@
-# $Id: test_eventables.rb 323 2007-05-22 22:22:43Z blackhedd $
+# $Id: test_eventables.rb 399 2007-07-11 02:50:20Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -43,7 +43,10 @@ class TestEventables < Test::Unit::TestCase
   def teardown
   end
 
-  def test_a
+  def test_a; end # shut up rake until we define a test.
+
+  # TODO, this idea is still half-baked.
+  def xxx_test_a
     n = 0
     tester = EvTest.new
     tester.listen_event( :fire1 ) {|arg|
@@ -56,7 +59,7 @@ class TestEventables < Test::Unit::TestCase
       EventMachine::add_timer(1) {EventMachine.stop}
     }
 
-    assert n == 1
+    assert_equal( 1, n )
   end
 
 end

data/tests/test_httpclient.rb

@@ -1,4 +1,4 @@
-# $Id: test_httpclient.rb 323 2007-05-22 22:22:43Z blackhedd $
+# $Id: test_httpclient.rb 398 2007-07-11 02:46:22Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -152,6 +152,8 @@ class TestHttpClient < Test::Unit::TestCase
       end
   end
 
+  # TODO, this is WRONG. The handler is asserting an HTTP 1.1 request, but the client
+  # is sending a 1.0 request. Gotta fix the client
   def test_post
       response = nil
       EventMachine.run {

data/tests/test_ltp.rb

@@ -1,4 +1,4 @@
-# $Id: test_ltp.rb 323 2007-05-22 22:22:43Z blackhedd $
+# $Id: test_ltp.rb 396 2007-07-11 01:49:34Z blackhedd $
 #
 # Author:: Francis Cianfrocca (gmail: blackhedd)
 # Homepage::  http://rubyeventmachine.com
@@ -99,7 +99,7 @@ class TestLineAndTextProtocol < Test::Unit::TestCase
 	end
 	def receive_line line
 	    if line =~ /content-length:\s*(\d+)/i
-		@content_lenth = $1.to_i
+		@content_length = $1.to_i
 	    elsif line.length == 0
 		set_binary_mode @content_length
 	    end
@@ -119,7 +119,7 @@ class TestLineAndTextProtocol < Test::Unit::TestCase
 	    EventMachine.start_server( TestHost, TestPort, LineAndTextTest ) do |conn|
 		conn.instance_eval "@lines = lines_received; @text = text_received"
 	    end
-	    EventMachine.add_timer(4) {raise "test timed out"}
+	    EventMachine.add_timer(2) {raise "test timed out"}
 	    EventMachine.defer proc {
 		t = TCPSocket.new TestHost, TestPort
 		t.puts "Content-length: 400"
@@ -177,7 +177,6 @@ class TestLineAndTextProtocol < Test::Unit::TestCase
     end
 
     #--------------------------------------------------------------------
-
 end
 
 

data/tests/test_next_tick.rb

@@ -0,0 +1,57 @@
+# $Id: test_next_tick.rb 381 2007-06-15 19:48:11Z blackhedd $
+#
+# Author:: Francis Cianfrocca (gmail: blackhedd)
+# Homepage::  http://rubyeventmachine.com
+# Date:: 8 April 2006
+# 
+# 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.
+#
+#---------------------------------------------------------------------------
+#
+#
+#
+#
+
+$:.unshift "../lib"
+require 'eventmachine'
+
+
+
+class TestNextTick < Test::Unit::TestCase
+
+	def setup
+	end
+
+	def teardown
+	end
+
+	def test_tick_arg
+		pr = proc {EM.stop}
+		EM.epoll
+		EM.run {
+			EM.next_tick pr
+		}
+		assert true
+	end
+
+	def test_tick_block
+		EM.epoll
+		EM.run {
+			EM.next_tick {EM.stop}
+		}
+		assert true
+	end
+end

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: eventmachine
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
-date: 2007-05-22 00:00:00 -04:00
-summary: Ruby/EventMachine socket engine library
+  version: 0.8.0
+date: 2007-07-11 00:00:00 -04:00
+summary: Ruby/EventMachine library
 require_paths: 
 - lib
 email: garbagecat10@gmail.com
@@ -39,6 +39,8 @@ files:
 - tests/test_futures.rb
 - tests/test_exc.rb
 - tests/test_timers.rb
+- tests/test_epoll.rb
+- tests/test_next_tick.rb
 - lib/em
 - lib/protocols
 - lib/evma
@@ -49,6 +51,7 @@ files:
 - lib/em/eventable.rb
 - lib/em/deferrable.rb
 - lib/em/future.rb
+- lib/em/messages.rb
 - lib/protocols/httpclient.rb
 - lib/protocols/tcptest.rb
 - lib/protocols/line_and_text.rb
@@ -80,9 +83,13 @@ files:
 - ext/cmain.cpp
 - ext/ed.cpp
 - ext/ed.h
+- ext/pipe.cpp
+- ext/epoll.cpp
+- ext/epoll.h
 - README
 - RELEASE_NOTES
 - COPYING
+- EPOLL
 - GNU
 - LEGAL
 - TODO
@@ -98,6 +105,7 @@ extra_rdoc_files:
 - README
 - RELEASE_NOTES
 - COPYING
+- EPOLL
 - GNU
 - LEGAL
 - TODO