cool.io 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d730937f1acab28544c904ae2952ed826e8b475
-  data.tar.gz: 728a5a46fa65974a989c38f43249b43eca62fda2
+  metadata.gz: befae475513e70b03f1860baa2564540ee9bbdef
+  data.tar.gz: 1f492b338548bdd661a008d1621213b7d59ffe86
 SHA512:
-  metadata.gz: ff24cd2f7ae57c9f67f70fa7537640ae5e627f274a281eb9888f103ecbb79c330a672678ed83699f420b09259598f57bebfb9051bcf7c31e831cf57d63c53741
-  data.tar.gz: bbf3ecbac1d11057ac86a7cf5d5b1fa7a018249e19f9d780f48da9d6e401d366acdde024fccbaec928cd56308e60f564066debc0c2d48548989d94a243e1333b
+  metadata.gz: 3cdb6490f8a0f81e6f07fe00b4aa7a3e0152f71e8727e6779b8445c970e44c68314011c34101a19ea3ffbae4d2ca5d1e7f3eca3962e10ac780428d7e27ab0a42
+  data.tar.gz: 985f43951a363925d5da9c7472ec59564d07b317697cefc0a3aae6d4110e686005107616fd6ea723a9a480da749ff844d309545c0aca3073e18d926394272dd0

data/.travis.yml

@@ -1,10 +1,13 @@
 language: ruby
 
+sudo: false
+
 rvm:
   - 1.9.3
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.0
   - ruby-head
   - rbx
 

data/CHANGES.md

@@ -1,3 +1,9 @@
+1.4.3
+-----
+
+* Use accept instead of accept_nonblock on Windows to avoid thundering held problem
+* Fix compilation error on Solaris and Ruby 2.3.0
+
 1.4.2
 -----
 

data/appveyor.yml

@@ -0,0 +1,18 @@
+---
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - ruby --version
+  - gem --version
+  - bundle install
+build: off
+test_script:
+  - bundle exec rake -rdevkit
+
+environment:
+  matrix:
+    - ruby_version: "200"
+    - ruby_version: "200-x64"
+    - ruby_version: "21"
+    - ruby_version: "21-x64"
+    - ruby_version: "22"
+    - ruby_version: "22-x64"

data/cool.io.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   s.add_development_dependency "rake-compiler", "~> 0.9.5"
-  s.add_development_dependency "rake-compiler-dock", "~> 0.4.3"
+  s.add_development_dependency "rake-compiler-dock", "~> 0.5.0"
   s.add_development_dependency "rspec", ">= 2.13.0"
   s.add_development_dependency "rdoc", ">= 3.6.0"
 end

data/ext/cool.io/extconf.rb

@@ -42,6 +42,11 @@ else
   end
 end
 
+if RUBY_PLATFORM =~ /solaris/
+  # libev/ev.c requires NSIG which is undefined if _XOPEN_SOURCE is defined
+  $defs << '-D__EXTENSIONS__'
+end
+
 $LIBS << ' ' << libs.join(' ')
 
 dir_config('cool.io_ext')

data/lib/cool.io/listener.rb

@@ -40,19 +40,31 @@ module Coolio
     #########
 
     # Coolio callback for handling new connections
-    def on_readable
-      begin
-        on_connection @listen_socket.accept_nonblock
-      rescue Errno::EAGAIN, Errno::ECONNABORTED
-        # EAGAIN can be triggered here if the socket is shared between
-        # multiple processes and a thundering herd is woken up to accept
-        # one connection, only one process will get the connection and
-        # the others will be awoken.
-        # ECONNABORTED is documented in accept() manpages but modern TCP
-        # stacks with syncookies and/or accept()-filtering for DoS
-        # protection do not see it.  In any case this error is harmless
-        # and we should instead spend our time with clients that follow
-        # through on connection attempts.
+    unless RUBY_PLATFORM =~ /mingw|mswin/
+      def on_readable
+        begin
+          on_connection @listen_socket.accept_nonblock
+        rescue Errno::EAGAIN, Errno::ECONNABORTED
+          # EAGAIN can be triggered here if the socket is shared between
+          # multiple processes and a thundering herd is woken up to accept
+          # one connection, only one process will get the connection and
+          # the others will be awoken.
+          # ECONNABORTED is documented in accept() manpages but modern TCP
+          # stacks with syncookies and/or accept()-filtering for DoS
+          # protection do not see it.  In any case this error is harmless
+          # and we should instead spend our time with clients that follow
+          # through on connection attempts.
+        end
+      end
+    else
+      def on_readable
+        begin
+          # In Windows, accept_nonblock() with multiple processes
+          # causes thundering herd problem.
+          # To avoid this, we need to use accept().
+          on_connection @listen_socket.accept
+        rescue Errno::EAGAIN, Errno::ECONNABORTED
+        end
       end
     end
   end

data/lib/cool.io/version.rb

@@ -1,5 +1,5 @@
 module Coolio
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
   
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cool.io
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Tony Arcieri
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +86,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- appveyor.yml
 - cool.io.gemspec
 - examples/callbacked_echo_server.rb
 - examples/dslified_echo_client.rb