eventmachine 1.0.3-x86-mingw32 → 1.2.0.dev.2-x86-mingw32

data/lib/jeventmachine.rb

@@ -268,6 +268,20 @@ module EventMachine
     @em.getConnectionCount
   end
 
+  def self.pause_connection(sig)
+    @em.pauseConnection(sig)
+  end
+  def self.resume_connection(sig)
+    @em.resumeConnection(sig)
+  end
+  def self.connection_paused?(sig)
+    @em.isConnectionPaused(sig)
+  end
+  def self._get_outbound_data_size(sig)
+    @em.getOutboundDataSize(sig)
+  end
+
+
   def self.set_tls_parms(sig, params)
   end
   def self.start_tls(sig)
@@ -279,6 +293,9 @@ module EventMachine
     def associate_callback_target sig
       # No-op for the time being
     end
+    def get_outbound_data_size
+      EM._get_outbound_data_size @signature
+    end
   end
 end
 

data/rakelib/package.rake

@@ -25,14 +25,19 @@ else
   def setup_cross_compilation(ext)
     unless RUBY_PLATFORM =~ /mswin|mingw/
       ext.cross_compile = true
-      ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
+      ext.cross_platform = ['x86-mingw32', 'x64-mingw32']
     end
   end
   def hack_cross_compilation(ext)
     # inject 1.8/1.9 pure-ruby entry point
     # HACK: add these dependencies to the task instead of using cross_compiling
-    ext.cross_platform.each do |platform|
-      Rake::Task["native:#{GEMSPEC.name}:#{platform}"].prerequisites.unshift "lib/#{ext.name}.rb"
+    if ext.cross_platform.is_a?(Array)
+      ext.cross_platform.each do |platform|
+        task = "native:#{GEMSPEC.name}:#{platform}"
+        if Rake::Task.task_defined?(task)
+          Rake::Task[task].prerequisites.unshift "lib/#{ext.name}.rb"
+        end
+      end
     end
   end
 
@@ -60,7 +65,7 @@ end
   require "\#{$1}/#{File.basename(t.name, '.rb')}"
       eoruby
     end
-    at_exit{ FileUtils.rm t.name if File.exists?(t.name) }
+    at_exit{ FileUtils.rm t.name if File.exist?(t.name) }
   end
 end
 
@@ -91,3 +96,25 @@ def gem_cmd(action, name, *args)
 end
 
 Rake::Task[:clean].enhance [:clobber_package]
+
+# DevKit task following the example of Luis Lavena's test-ruby-c-extension
+task :devkit do
+  begin
+    require "devkit"
+  rescue LoadError => e
+    abort "Failed to activate RubyInstaller's DevKit required for compilation."
+  end
+end
+
+if RUBY_PLATFORM =~ /mingw|mswin/
+  Rake::Task['compile'].prerequisites.unshift 'devkit'
+end
+
+desc "Build binary gems for Windows with rake-compiler-dock"
+task 'gem:windows' do
+  require 'rake_compiler_dock'
+  RakeCompilerDock.sh <<-EOT
+    RUBY_CC_VERSION="${RUBY_CC_VERSION//1.8.7/}"
+    bundle && rake cross native gem
+  EOT
+end

data/tests/dhparam.pem

@@ -0,0 +1,13 @@
+-----BEGIN DH PARAMETERS-----
+MIICCAKCAgEAikiatXa5aAteOtd6hOO33npjCvJByD3dwuM8rWzz0DFZdUH9nFJi
+b0VvTVweVECb6XZBsrDNLqGQykCrm43swSk5D9XQCGJLxFERD6yk3b90xaeCm3/a
+b0Ek5ZVvV73Cc/YbVmpBiOHoTFpUFJLZ7pLMQUSn8y3qUlNcY9/88HuwFi1s1lRM
+ovihSRyZMYAuYWOD4yuOuIcroKVjD6gWFrsW9XrALWny6vUXQrhk8Q3rj+wM6ZtE
+5afcB0b6ZJtphrDfk3dFjOVG/zVT37VWgrY8GABrpo2ey0W0WIQJ7rDKLaPaI4kc
+voOgC2K8Z3kSARZK+jULnwmBeYECz4EH/FF6FEp3GOKtkL4mqEkvh1n5EAesDOGl
+iiX+RZXcUrZliSeifSXBTMJWWFVC0fkGIMb9PTZfZHyAC54lpuxzVki0HIyQG9Fs
+41zBJ5e8eEoXXlfUYtduUC35YGy2IxSzYLAJE76rctAZSWghha9xLOCDFoLjMr8h
+FosKeHKJcBQ0bc8ymOpRIfrYLWhc0Pz2zkpJ/4eYw9t7NYg7S+jP19IE0gUnuM9v
+SpoYMtS28tP9nEdokdwuBKD0D3bJEBBefDlHgfXoMgvy9Hivc9PBGGNTNpyFPpwF
+sWVAkfhoNMJMC5V7LZsze+lftiDtzVoLSPDa9bO4BK7b/MgwCxfOhGsCAQI=
+-----END DH PARAMETERS-----

data/tests/em_test_helper.rb

@@ -31,6 +31,61 @@ class Test::Unit::TestCase
     @@port
   end
 
+  # Returns true if the host have a localhost 127.0.0.1 IPv4.
+  def self.local_ipv4?
+    return @@has_local_ipv4 if defined?(@@has_local_ipv4)
+    begin
+      get_my_ipv4_address "127.0.0.1"
+      @@has_local_ipv4 = true
+    rescue
+      @@has_local_ipv4 = false
+    end
+  end
+
+  # Returns true if the host have a public IPv4 and stores it in
+  # @@public_ipv4.
+  def self.public_ipv4?
+    return @@has_public_ipv4 if defined?(@@has_public_ipv4)
+    begin
+      @@public_ipv4 = get_my_ipv4_address "1.2.3.4"
+      @@has_public_ipv4 = true
+    rescue
+      @@has_public_ipv4 = false
+    end
+  end
+
+  # Returns true if the host have a localhost ::1 IPv6.
+  def self.local_ipv6?
+    return @@has_local_ipv6 if defined?(@@has_local_ipv6)
+    begin
+      get_my_ipv6_address "::1"
+      @@has_local_ipv6 = true
+    rescue
+      @@has_local_ipv6 = false
+    end
+  end
+
+  # Returns true if the host have a public IPv6 and stores it in
+  # @@public_ipv6.
+  def self.public_ipv6?
+    return @@has_public_ipv6 if defined?(@@has_public_ipv6)
+    begin
+      @@public_ipv6 = get_my_ipv6_address "2001::1"
+      @@has_public_ipv6 = true
+    rescue
+      @@has_public_ipv6 = false
+    end
+  end
+
+  # Returns an array with the localhost addresses (IPv4 and/or IPv6).
+  def local_ips
+    return @@local_ips if defined?(@@local_ips)
+    @@local_ips = []
+    @@local_ips << "127.0.0.1" if self.class.local_ipv4?
+    @@local_ips << "::1" if self.class.local_ipv6?
+    @@local_ips
+  end
+
   def exception_class
     jruby? ? NativeException : RuntimeError
   end
@@ -41,10 +96,18 @@ class Test::Unit::TestCase
       RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
     end
 
+    def solaris?
+      RUBY_PLATFORM =~ /solaris/
+    end
+
     # http://stackoverflow.com/questions/1342535/how-can-i-tell-if-im-running-from-jruby-vs-ruby/1685970#1685970
     def jruby?
       defined? JRUBY_VERSION
     end
+
+    def rbx?
+      defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+    end
   end
 
   include PlatformHelper
@@ -61,4 +124,28 @@ class Test::Unit::TestCase
       $VERBOSE = backup
     end
   end
+
+
+  private
+
+  def self.get_my_ipv4_address ip
+    orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true  # turn off reverse DNS resolution temporarily
+    UDPSocket.open(Socket::AF_INET) do |s|
+      s.connect ip, 1
+      s.addr.last
+    end
+  ensure
+    Socket.do_not_reverse_lookup = orig
+  end
+
+  def self.get_my_ipv6_address ip
+    orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true  # turn off reverse DNS resolution temporarily
+    UDPSocket.open(Socket::AF_INET6) do |s|
+      s.connect ip, 1
+      s.addr.last
+    end
+  ensure
+    Socket.do_not_reverse_lookup = orig
+  end
+
 end

data/tests/test_attach.rb

@@ -4,6 +4,7 @@ require 'socket'
 class TestAttach < Test::Unit::TestCase
   class EchoServer < EM::Connection
     def receive_data data
+      $received_data << data
       send_data data
     end
   end
@@ -31,12 +32,14 @@ class TestAttach < Test::Unit::TestCase
   def setup
     @port = next_port
     $read, $r, $w, $fd = nil
+    $received_data = ""
   end
 
   def teardown
     [$r, $w].each do |io|
       io.close rescue nil
     end
+    $received_data = nil
   end
 
   def test_attach
@@ -63,6 +66,28 @@ class TestAttach < Test::Unit::TestCase
     end
   end
 
+  def test_attach_server
+    omit_if(jruby?)
+    $before = TCPServer.new("127.0.0.1", @port)
+    sig     = nil
+    EM.run {
+      sig = EM.attach_server $before, EchoServer
+
+      handler = Class.new(EM::Connection) do
+        def initialize
+          send_data "hello world"
+          close_connection_after_writing
+          EM.add_timer(0.1) { EM.stop }
+        end
+      end
+      EM.connect("127.0.0.1", @port, handler)
+    }
+
+    assert_equal false, $before.closed?
+    assert_equal "hello world", $received_data
+    assert sig.is_a?(Integer)
+  end
+
   def test_attach_pipe
     EM.run{
       $r, $w = IO.pipe

data/tests/test_basic.rb

@@ -93,15 +93,28 @@ class TestBasic < Test::Unit::TestCase
     end
   end
 
-  def test_unbind_error
+  def test_unbind_error_during_stop
     assert_raises( UnbindError::ERR ) {
       EM.run {
         EM.start_server "127.0.0.1", @port
-        EM.connect "127.0.0.1", @port, UnbindError
+        EM.connect "127.0.0.1", @port, UnbindError do
+          EM.stop
+        end
       }
     }
   end
 
+  def test_unbind_error
+    EM.run {
+      EM.error_handler do |e|
+        assert(e.is_a?(UnbindError::ERR))
+        EM.stop
+      end
+      EM.start_server "127.0.0.1", @port
+      EM.connect "127.0.0.1", @port, UnbindError
+    }
+  end
+
   module BrsTestSrv
     def receive_data data
       $received << data
@@ -131,6 +144,8 @@ class TestBasic < Test::Unit::TestCase
   end
 
   def test_bind_connect
+    pend('FIXME: this test is broken on Windows') if windows?
+
     local_ip = UDPSocket.open {|s| s.connect('google.com', 80); s.addr.last }
 
     bind_port = next_port
@@ -179,18 +194,15 @@ class TestBasic < Test::Unit::TestCase
     assert x
   end
 
-  if EM.respond_to? :set_heartbeat_interval
-    def test_set_heartbeat_interval
-      interval = 0.5
-      EM.run {
-        EM.set_heartbeat_interval interval
-        $interval = EM.get_heartbeat_interval
-        EM.stop
-      }
-      assert_equal(interval, $interval)
-    end
-  else
-    warn "EM.set_heartbeat_interval not implemented, skipping a test in #{__FILE__}"
+  def test_set_heartbeat_interval
+    omit_if(jruby?)
+    interval = 0.5
+    EM.run {
+      EM.set_heartbeat_interval interval
+      $interval = EM.get_heartbeat_interval
+      EM.stop
+    }
+    assert_equal(interval, $interval)
   end
   
   module PostInitRaiser
@@ -226,6 +238,7 @@ class TestBasic < Test::Unit::TestCase
   end
   
   def test_schedule_close
+    omit_if(jruby?)
     localhost, port = '127.0.0.1', 9000
     timer_ran = false
     num_close_scheduled = nil
@@ -246,30 +259,6 @@ class TestBasic < Test::Unit::TestCase
     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 = []

data/tests/test_channel.rb

@@ -59,4 +59,17 @@ class TestEMChannel < Test::Unit::TestCase
 
     assert_equal [1,2,3], out
   end
-end
+
+  def test_channel_num_subscribers
+     subs = 0
+     EM.run do
+       c = EM::Channel.new
+       c.subscribe { |v| s = v }
+       c.subscribe { |v| s = v }
+       EM.next_tick { EM.stop }
+       subs = c.num_subscribers
+     end
+
+     assert_equal subs, 2
+  end
+end

data/tests/test_completion.rb

@@ -1,3 +1,4 @@
+require 'em_test_helper'
 require 'em/completion'
 
 class TestCompletion < Test::Unit::TestCase

data/tests/test_connection_count.rb

@@ -30,4 +30,25 @@ class TestConnectionCount < Test::Unit::TestCase
     assert_equal(1, $server_conns)
     assert_equal(4, $client_conns + $server_conns)
   end
-end
+
+  module DoubleCloseClient
+    def unbind
+      close_connection
+      $num_close_scheduled_1 = EM.num_close_scheduled
+      EM.next_tick do
+        $num_close_scheduled_2 = EM.num_close_scheduled
+        EM.stop
+      end
+    end
+  end
+
+  def test_num_close_scheduled
+    omit_if(jruby?)
+    EM.run {
+      assert_equal(0, EM.num_close_scheduled)
+      EM.connect("127.0.0.1", 9999, DoubleCloseClient) # nothing listening on 9999
+    }
+    assert_equal(1, $num_close_scheduled_1)
+    assert_equal(0, $num_close_scheduled_2)
+  end
+end

data/tests/test_connection_write.rb

@@ -0,0 +1,35 @@
+require 'em_test_helper'
+
+class TestConnectionWrite < Test::Unit::TestCase
+
+  # This test takes advantage of the fact that EM::_RunSelectOnce iterates over the connections twice:
+  #   - once to determine which ones to call Write() on
+  #   - and once to call Write() on each of them.
+  #
+  # But state may change in the meantime before Write() is finally called.
+  # And that is what we try to exploit to get Write() to be called when bWatchOnly is true, and bNotifyWritable is false,
+  # to cause an assertion failure.
+
+  module SimpleClient
+    def notify_writable
+      $conn2.notify_writable = false  # Being naughty in callback
+      # If this doesn't crash anything, the test passed!
+    end
+  end
+
+  def test_with_naughty_callback
+    EM.run do
+      r1, _ = IO.pipe
+      r2, _ = IO.pipe
+
+      # Adding EM.watches
+      $conn1 = EM.watch(r1, SimpleClient)
+      $conn2 = EM.watch(r2, SimpleClient)
+
+      $conn1.notify_writable = true
+      $conn2.notify_writable = true
+
+      EM.stop
+    end
+  end
+end