eventmachine-maglev- 1.0.0.beta.4 → 1.0.0.rc.4

data/lib/em/protocols/smtpclient.rb

@@ -31,38 +31,38 @@ module EventMachine
     # Simple SMTP client
     #
     # @example
-    #  email = EM::Protocols::SmtpClient.send(
-    #    :domain=>"example.com",
-    #    :host=>'localhost',
-    #    :port=>25, # optional, defaults 25
-    #    :starttls=>true, # use ssl
-    #    :from=>"sender@example.com",
-    #    :to=> ["to_1@example.com", "to_2@example.com"],
-    #    :header=> {"Subject" => "This is a subject line"},
-    #    :body=> "This is the body of the email"
-    #  )
-    #  email.callback{
-    #    puts 'Email sent!'
-    #  }
-    #  email.errback{ |e|
-    #    puts 'Email failed!'
-    #  }
+    #   email = EM::Protocols::SmtpClient.send(
+    #     :domain=>"example.com",
+    #     :host=>'localhost',
+    #     :port=>25, # optional, defaults 25
+    #     :starttls=>true, # use ssl
+    #     :from=>"sender@example.com",
+    #     :to=> ["to_1@example.com", "to_2@example.com"],
+    #     :header=> {"Subject" => "This is a subject line"},
+    #     :body=> "This is the body of the email"
+    #   )
+    #   email.callback{
+    #     puts 'Email sent!'
+    #   }
+    #   email.errback{ |e|
+    #     puts 'Email failed!'
+    #   }
     #
     # Sending generated emails (using mailfactory)
     #
-    #  mail = MailFactory.new
-    #  mail.to = 'someone@site.co'
-    #  mail.from = 'me@site.com'
-    #  mail.subject = 'hi!'
-    #  mail.text = 'hello world'
-    #  mail.html = '<h1>hello world</h1>'
+    #   mail = MailFactory.new
+    #   mail.to = 'someone@site.co'
+    #   mail.from = 'me@site.com'
+    #   mail.subject = 'hi!'
+    #   mail.text = 'hello world'
+    #   mail.html = '<h1>hello world</h1>'
     #
-    #  email = EM::P::SmtpClient.send(
-    #    :domain=>'site.com',
-    #    :from=>mail.from,
-    #    :to=>mail.to,
-    #    :content=>"#{mail.to_s}\r\n.\r\n"
-    #  )
+    #   email = EM::P::SmtpClient.send(
+    #     :domain=>'site.com',
+    #     :from=>mail.from,
+    #     :to=>mail.to,
+    #     :content=>"#{mail.to_s}\r\n.\r\n"
+    #   )
     #
     class SmtpClient < Connection
       include EventMachine::Deferrable

data/lib/em/pure_ruby.rb

@@ -177,6 +177,18 @@ module EventMachine
     def set_max_timer_count n
     end
 
+    # @private
+    def get_sock_opt signature, level, optname
+      selectable = Reactor.instance.get_selectable( signature ) or raise "unknown get_peername target"
+      selectable.getsockopt level, optname
+    end
+
+    # @private
+    def set_sock_opt signature, level, optname, optval
+      selectable = Reactor.instance.get_selectable( signature ) or raise "unknown get_peername target"
+      selectable.setsockopt level, optname, optval
+    end
+
     # @private
     def send_file_data sig, filename
       sz = File.size(filename)

data/lib/em/threaded_resource.rb

@@ -29,7 +29,7 @@ module EventMachine
   #
   #    # If we don't care about the result:
   #    pool.perform do |dispatcher|
-  #      # The following blcok executes inside a dedicated thread, and should not
+  #      # The following block executes inside a dedicated thread, and should not
   #      # access EventMachine things:
   #      dispatcher.dispatch do |cassandra|
   #        cassandra.insert(:Things, '10', 'stuff' => 'things')

data/lib/em/version.rb

@@ -1,3 +1,3 @@
 module EventMachine
-  VERSION = "1.0.0.beta.4"
+  VERSION = "1.0.0.rc.4"
 end

data/lib/eventmachine.rb

@@ -82,7 +82,8 @@ module EventMachine
   @reactor_running = false
   @next_tick_queue = []
   @tails = []
-  @threadpool = nil
+  @threadpool = @threadqueue = @resultqueue = nil
+  @all_threads_spawned = false
 
   # System errnos
   # @private
@@ -157,7 +158,13 @@ module EventMachine
     # will start without release_machine being called and will immediately throw
 
     #
-
+    if reactor_running? and @reactor_pid != Process.pid
+      # Reactor was started in a different parent, meaning we have forked.
+      # Clean up reactor state so a new reactor boots up in this child.
+      stop_event_loop
+      release_machine
+      @reactor_running = false
+    end
 
     tail and @tails.unshift(tail)
 
@@ -171,6 +178,7 @@ module EventMachine
       @next_tick_queue ||= []
       @tails ||= []
       begin
+        @reactor_pid = Process.pid
         @reactor_running = true
         initialize_event_machine
         (b = blk || block) and add_timer(0, b)
@@ -203,6 +211,7 @@ module EventMachine
             @threadqueue = nil
             @resultqueue = nil
             @threadpool = nil
+            @all_threads_spawned = false
           end
 
           @next_tick_queue = []
@@ -254,7 +263,7 @@ module EventMachine
       if self.reactor_running?
         self.stop_event_loop
         self.release_machine
-        self.instance_variable_set( '@reactor_running', false )
+        @reactor_running = false
       end
       self.run block
     end
@@ -427,7 +436,8 @@ module EventMachine
   # that you must define. When the network server that is started by
   # start_server accepts a new connection, it instantiates a new
   # object of an anonymous class that is inherited from {EventMachine::Connection},
-  # *into which your handler module have been included*.
+  # *into which your handler module have been included*. Arguments passed into start_server
+  # after the class name are passed into the constructor during the instantiation.
   #
   # Your handler module may override any of the methods in {EventMachine::Connection},
   # such as {EventMachine::Connection#receive_data}, in order to implement the specific behavior
@@ -738,6 +748,7 @@ module EventMachine
     c = klass.new s, *args
 
     c.instance_variable_set(:@io, io)
+    c.instance_variable_set(:@watch_mode, watch_mode)
     c.instance_variable_set(:@fd, fd)
 
     @conns[s] = c
@@ -763,7 +774,11 @@ module EventMachine
     #raise "still connected" if @conns.has_key?(handler.signature)
     return handler if @conns.has_key?(handler.signature)
 
-    s = connect_server server, port
+    s = if port
+          connect_server server, port
+        else
+          connect_unix_server server
+        end
     handler.signature = s
     @conns[s] = handler
     block_given? and yield handler
@@ -938,10 +953,21 @@ module EventMachine
       cback.call result if cback
     end
 
-    @next_tick_mutex.synchronize do
-      jobs, @next_tick_queue = @next_tick_queue, []
-      jobs
-    end.each { |j| j.call }
+    # Capture the size at the start of this tick...
+    size = @next_tick_mutex.synchronize { @next_tick_queue.size }
+    size.times do |i|
+      callback = @next_tick_mutex.synchronize { @next_tick_queue.shift }
+      begin
+        callback.call
+      ensure
+        # This is a little nasty. The problem is, if an exception occurs during
+        # the callback, then we need to send a signal to the reactor to actually
+        # do some work during the next_tick. The only mechanism we have from the
+        # ruby side is next_tick itself, although ideally, we'd just drop a byte
+        # on the loopback descriptor.
+        EM.next_tick {} if $!
+      end
+    end
   end
 
 
@@ -993,7 +1019,6 @@ module EventMachine
     # has no constructor.
 
     unless @threadpool
-      require 'thread'
       @threadpool = []
       @threadqueue = ::Queue.new
       @resultqueue = ::Queue.new
@@ -1018,6 +1043,19 @@ module EventMachine
       end
       @threadpool << thread
     end
+    @all_threads_spawned = true
+  end
+
+  ##
+  # Returns +true+ if all deferred actions are done executing and their
+  # callbacks have been fired.
+  #
+  def self.defers_finished?
+    return false if @threadpool and !@all_threads_spawned
+    return false if @threadqueue and not @threadqueue.empty?
+    return false if @resultqueue and not @resultqueue.empty?
+    return false if @threadpool and @threadqueue.num_waiting != @threadpool.size
+    return true
   end
 
   class << self
@@ -1393,11 +1431,19 @@ module EventMachine
     if opcode == ConnectionUnbound
       if c = @conns.delete( conn_binding )
         begin
-          if c.original_method(:unbind).arity == 1
+          if c.original_method(:unbind).arity != 0
             c.unbind(data == 0 ? nil : EventMachine::ERRNOS[data])
           else
             c.unbind
           end
+          # If this is an attached (but not watched) connection, close the underlying io object.
+          if c.instance_variable_defined?(:@io) and !c.instance_variable_get(:@watch_mode)
+            io = c.instance_variable_get(:@io)
+            begin
+              io.close
+            rescue Errno::EBADF, IOError
+            end
+          end
         rescue
           @wrapped_exception = $!
           stop

data/lib/jeventmachine.rb

@@ -203,6 +203,11 @@ module EventMachine
       Socket.pack_sockaddr_in(*peer)
     end
   end
+  def self.get_sockname sig
+    if sockName = @em.getSockName(sig)
+      Socket.pack_sockaddr_in(*sockName)
+    end
+  end
   # @private
   def self.attach_fd fileno, watch_mode
     # 3Aug09: We could pass in the actual SocketChannel, but then it would be modified (set as non-blocking), and

data/tests/test_basic.rb

@@ -224,4 +224,71 @@ class TestBasic < Test::Unit::TestCase
       end
     end
   end
+  
+  def test_schedule_close
+    localhost, port = '127.0.0.1', 9000
+    timer_ran = false
+    num_close_scheduled = nil
+    EM.run do
+      assert_equal 0, EM.num_close_scheduled
+      EM.add_timer(1) { timer_ran = true; EM.stop }
+      EM.start_server localhost, port do |s|
+        s.close_connection
+        num_close_scheduled = EM.num_close_scheduled
+      end
+      EM.connect localhost, port do |c|
+        def c.unbind
+          EM.stop
+        end
+      end
+    end
+    assert !timer_ran
+    assert_equal 1, num_close_scheduled
+  end
+
+  def test_fork_safe
+    return unless cpid = fork { exit! } rescue false
+
+    read, write = IO.pipe
+    EM.run do
+      cpid = fork do
+        write.puts "forked"
+        EM.run do
+          EM.next_tick do
+            write.puts "EM ran"
+            exit!
+          end
+        end
+      end
+      EM.stop
+    end
+    Process.waitall
+    assert_equal "forked\n", read.readline
+    assert_equal "EM ran\n", read.readline
+  ensure
+    read.close rescue nil
+    write.close rescue nil
+  end
+
+  def test_error_handler_idempotent # issue 185
+    errors = []
+    ticks = []
+    EM.error_handler do |e|
+      errors << e
+    end
+
+    EM.run do
+      EM.next_tick do
+        ticks << :first
+        raise
+      end
+      EM.next_tick do
+        ticks << :second
+      end
+      EM.add_timer(0.001) { EM.stop }
+    end
+
+    assert_equal 1, errors.size
+    assert_equal [:first, :second], ticks
+  end
 end

data/tests/test_idle_connection.rb

@@ -0,0 +1,23 @@
+require 'em_test_helper'
+
+class TestIdleConnection < Test::Unit::TestCase
+  if EM.respond_to?(:get_idle_time)
+    def test_idle_time
+      EM.run{
+        conn = EM.connect 'www.google.com', 80
+        EM.add_timer(3){
+          $idle_time = conn.get_idle_time
+          conn.send_data "GET / HTTP/1.0\r\n\r\n"
+          EM.next_tick{
+            $idle_time_after_send = conn.get_idle_time
+            conn.close_connection
+            EM.stop
+          }
+        }
+      }
+
+      assert_in_delta 3, $idle_time, 0.2
+      assert_equal 0, $idle_time_after_send
+    end
+  end
+end

data/tests/test_pool.rb

@@ -115,6 +115,41 @@ class TestPool < Test::Unit::TestCase
     assert_equal [:res], pool.contents
   end
 
+  def test_contents_when_perform_errors_and_on_error_is_not_set
+    pool.add :res
+    assert_equal [:res], pool.contents
+
+    pool.perform do |r|
+      d = EM::DefaultDeferrable.new
+      d.fail
+      d
+    end
+
+    EM.run { EM.next_tick { EM.stop } }
+
+    assert_equal [:res], pool.contents
+  end
+
+  def test_contents_when_perform_errors_and_on_error_is_set
+    pool.add :res
+    res = nil
+    pool.on_error do |r|
+      res = r
+    end
+    assert_equal [:res], pool.contents
+
+    pool.perform do |r|
+      d = EM::DefaultDeferrable.new
+      d.fail 'foo'
+      d
+    end
+
+    EM.run { EM.next_tick { EM.stop } }
+
+    assert_equal :res, res
+    assert_equal [], pool.contents
+  end
+
   def test_num_waiting
     pool.add :res
     assert_equal 0, pool.num_waiting
@@ -125,4 +160,35 @@ class TestPool < Test::Unit::TestCase
     assert_equal 10, pool.num_waiting
   end
 
-end
+  def test_exceptions_in_the_work_block_bubble_up_raise_and_fail_the_resource
+    pool.add :res
+
+    res = nil
+    pool.on_error { |r| res = r }
+    pool.perform { raise 'boom' }
+
+    assert_raises(RuntimeError) do
+      EM.run { EM.next_tick { EM.stop } }
+    end
+
+    assert_equal [], pool.contents
+    assert_equal :res, res
+  end
+
+  def test_removed_list_does_not_leak_on_errors
+    pool.add :res
+
+    pool.on_error do |r|
+      # This is actually the wrong thing to do, and not required, but some users
+      # might do it. When they do, they would find that @removed would cause a
+      # slow leak.
+      pool.remove r
+    end
+
+    pool.perform { d = EM::DefaultDeferrable.new; d.fail; d }
+
+    EM.run { EM.next_tick { EM.stop } }
+    assert_equal [], pool.instance_variable_get(:@removed)
+  end
+
+end

data/tests/test_processes.rb

@@ -99,6 +99,24 @@ class TestProcesses < Test::Unit::TestCase
 
       assert_equal("hello\n", $out)
     end
+
+    def test_em_popen_pause_resume
+      c_rx = 0
+
+      test_client = Module.new do
+        define_method :receive_data do |data|
+          c_rx += 1
+          pause
+          EM.add_timer(0.5) { EM.stop }
+        end
+      end
+
+      EM.run{
+        EM.popen('cat /dev/random', test_client)
+      }
+
+      assert_equal 1, c_rx
+    end
   else
     warn "EM.popen not implemented, skipping tests in #{__FILE__}"
 

data/tests/test_proxy_connection.rb

@@ -24,6 +24,7 @@ class TestProxyConnection < Test::Unit::TestCase
       end
 
       def unbind
+        $proxied_bytes = self.get_proxied_bytes
         @client.close_connection_after_writing
       end
     end
@@ -94,7 +95,7 @@ class TestProxyConnection < Test::Unit::TestCase
       end
 
       def receive_data(data)
-        EM.connect("127.0.0.1", @port, ProxyConnection, self, data)
+        @proxy = EM.connect("127.0.0.1", @port, ProxyConnection, self, data)
       end
     end
 
@@ -134,6 +135,17 @@ class TestProxyConnection < Test::Unit::TestCase
       assert_equal("I know!", $client_data)
     end
 
+    def test_proxied_bytes
+      EM.run {
+        EM.start_server("127.0.0.1", @port, Server)
+        EM.start_server("127.0.0.1", @proxy_port, ProxyServer, @port)
+        EM.connect("127.0.0.1", @proxy_port, Client)
+      }
+
+      assert_equal("I know!", $client_data)
+      assert_equal("I know!".bytesize, $proxied_bytes)
+    end
+
     def test_partial_proxy_connection
       EM.run {
         EM.start_server("127.0.0.1", @port, Server)

data/tests/test_set_sock_opt.rb

@@ -0,0 +1,37 @@
+require 'em_test_helper'
+require 'socket'
+
+class TestSetSockOpt < Test::Unit::TestCase
+
+  if EM.respond_to? :set_sock_opt
+    def setup
+      assert(!EM.reactor_running?)
+    end
+
+    def teardown
+      assert(!EM.reactor_running?)
+    end
+
+    #-------------------------------------
+
+    def test_set_sock_opt
+      test = self
+      EM.run do
+        EM.connect 'google.com', 80, Module.new {
+          define_method :post_init do
+            val = set_sock_opt Socket::SOL_SOCKET, Socket::SO_DEBUG, true
+            test.assert_equal 0, val
+            EM.stop
+          end
+        }
+      end
+    end
+  else
+    warn "EM.set_sock_opt not implemented, skipping tests in #{__FILE__}"
+
+    # Because some rubies will complain if a TestCase class has no tests
+    def test_em_set_sock_opt_unsupported
+      assert true
+    end
+  end
+end

data/tests/test_unbind_reason.rb

@@ -2,6 +2,15 @@ require 'em_test_helper'
 require 'socket'
 
 class TestUnbindReason < Test::Unit::TestCase
+
+  class StubConnection < EM::Connection
+    attr_reader :error
+    def unbind(reason = nil)
+      @error = reason
+      EM.stop
+    end
+  end
+
   def test_connect_timeout
     error = nil
     EM.run {
@@ -13,7 +22,7 @@ class TestUnbindReason < Test::Unit::TestCase
       }
       conn.pending_connect_timeout = 0.1
     }
-    assert_equal error, Errno::ETIMEDOUT
+    assert_equal Errno::ETIMEDOUT, error
   end
 
   def test_connect_refused
@@ -26,6 +35,14 @@ class TestUnbindReason < Test::Unit::TestCase
         end
       }
     }
-    assert_equal error, Errno::ECONNREFUSED
+    assert_equal Errno::ECONNREFUSED, error
+  end
+
+  def test_optional_argument
+    conn = nil
+    EM.run {
+      conn = EM.connect '127.0.0.1', 12388, StubConnection
+    }
+    assert_equal Errno::ECONNREFUSED, conn.error
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine-maglev-
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.4
+  version: 1.0.0.rc.4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-29 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &69825862374080 !ruby/object:Gem::Requirement
+  requirement: &70169512878700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.6
+        version: 0.8.1
   type: :development
   prerelease: false
-  version_requirements: *69825862374080
+  version_requirements: *70169512878700
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &69825862373380 !ruby/object:Gem::Requirement
+  requirement: &70169512877400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *69825862373380
+  version_requirements: *70169512877400
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &69825862372800 !ruby/object:Gem::Requirement
+  requirement: &70169512876360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69825862372800
+  version_requirements: *70169512876360
 description: ! 'EventMachine implements a fast, single-threaded engine for arbitrary
   network
 
@@ -193,9 +193,9 @@ files:
 - lib/em/version.rb
 - lib/eventmachine.rb
 - lib/jeventmachine.rb
-- tasks/cpp.rake_example
-- tasks/package.rake
-- tasks/test.rake
+- rakelib/cpp.rake_example
+- rakelib/package.rake
+- rakelib/test.rake
 - tests/client.crt
 - tests/client.key
 - tests/em_test_helper.rb
@@ -216,6 +216,7 @@ files:
 - tests/test_hc.rb
 - tests/test_httpclient.rb
 - tests/test_httpclient2.rb
+- tests/test_idle_connection.rb
 - tests/test_inactivity_timeout.rb
 - tests/test_kb.rb
 - tests/test_ltp.rb
@@ -235,6 +236,7 @@ files:
 - tests/test_sasl.rb
 - tests/test_send_file.rb
 - tests/test_servers.rb
+- tests/test_set_sock_opt.rb
 - tests/test_shutdown_hooks.rb
 - tests/test_smtpclient.rb
 - tests/test_smtpserver.rb