cool.io 1.2.2 → 1.2.3

data/CHANGES.md

@@ -1,3 +1,8 @@
+1.2.3
+-----
+
+* Fix CPU consuming issue on Windows.
+
 1.2.2
 -----
 

data/ext/libev/ev_select.c

@@ -67,6 +67,53 @@
 
 #include <string.h>
 
+#ifdef _WIN32
+/*
+########## COOLIO PATCHERY HO! ##########
+
+Ruby undefs FD_* utilities for own implementation.
+It converts fd argument into socket handle internally on Windows,
+so libev should not use Ruby's FD_* utilities.
+
+Following FD_* utilities come from MinGW.
+RubyInstaller is built by MinGW so this should work.
+*/
+int PASCAL __WSAFDIsSet(SOCKET,fd_set*);
+#define EV_WIN_FD_CLR(fd,set) do { u_int __i;\
+for (__i = 0; __i < ((fd_set *)(set))->fd_count ; __i++) {\
+	if (((fd_set *)(set))->fd_array[__i] == (fd)) {\
+	while (__i < ((fd_set *)(set))->fd_count-1) {\
+		((fd_set*)(set))->fd_array[__i] = ((fd_set*)(set))->fd_array[__i+1];\
+		__i++;\
+	}\
+	((fd_set*)(set))->fd_count--;\
+	break;\
+	}\
+}\
+} while (0)
+#define EV_WIN_FD_SET(fd, set) do { u_int __i;\
+for (__i = 0; __i < ((fd_set *)(set))->fd_count ; __i++) {\
+	if (((fd_set *)(set))->fd_array[__i] == (fd)) {\
+		break;\
+	}\
+}\
+if (__i == ((fd_set *)(set))->fd_count) {\
+	if (((fd_set *)(set))->fd_count < FD_SETSIZE) {\
+		((fd_set *)(set))->fd_array[__i] = (fd);\
+		((fd_set *)(set))->fd_count++;\
+	}\
+}\
+} while(0)
+#define EV_WIN_FD_ZERO(set) (((fd_set *)(set))->fd_count=0)
+#define EV_WIN_FD_ISSET(fd, set) __WSAFDIsSet((SOCKET)(fd), (fd_set *)(set))
+/* ######################################## */
+#else
+#define EV_WIN_FD_CLR FD_CLR
+#define EV_WIN_FD_SET FD_SET
+#define EV_WIN_FD_ZERO FD_ZERO
+#define EV_WIN_FD_ISSET FD_ISSET
+#endif
+
 static void
 select_modify (EV_P_ int fd, int oev, int nev)
 {
@@ -91,17 +138,17 @@ select_modify (EV_P_ int fd, int oev, int nev)
     if ((oev ^ nev) & EV_READ)
     #endif
       if (nev & EV_READ)
-        FD_SET (handle, (fd_set *)vec_ri);
+        EV_WIN_FD_SET (handle, (fd_set *)vec_ri);
       else
-        FD_CLR (handle, (fd_set *)vec_ri);
+        EV_WIN_FD_CLR (handle, (fd_set *)vec_ri);
 
     #if EV_SELECT_IS_WINSOCKET
     if ((oev ^ nev) & EV_WRITE)
     #endif
       if (nev & EV_WRITE)
-        FD_SET (handle, (fd_set *)vec_wi);
+        EV_WIN_FD_SET (handle, (fd_set *)vec_wi);
       else
-        FD_CLR (handle, (fd_set *)vec_wi);
+        EV_WIN_FD_CLR (handle, (fd_set *)vec_wi);
 
 #else
 
@@ -136,6 +183,8 @@ select_modify (EV_P_ int fd, int oev, int nev)
   }
 }
 
+#undef socket
+
 static void
 select_poll (EV_P_ ev_tstamp timeout)
 {
@@ -230,10 +279,10 @@ select_poll (EV_P_ ev_tstamp timeout)
           int handle = fd;
           #endif
 
-          if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ;
-          if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE;
+          if (EV_WIN_FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ;
+          if (EV_WIN_FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE;
           #ifdef _WIN32
-          if (FD_ISSET (handle, (fd_set *)vec_eo)) events |= EV_WRITE;
+          if (EV_WIN_FD_ISSET (handle, (fd_set *)vec_eo)) events |= EV_WRITE;
           #endif
 
           if (expect_true (events))
@@ -279,9 +328,9 @@ select_init (EV_P_ int flags)
   backend_poll    = select_poll;
 
 #if EV_SELECT_USE_FD_SET
-  vec_ri  = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri);
+  vec_ri  = ev_malloc (sizeof (fd_set)); EV_WIN_FD_ZERO ((fd_set *)vec_ri);
   vec_ro  = ev_malloc (sizeof (fd_set));
-  vec_wi  = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi);
+  vec_wi  = ev_malloc (sizeof (fd_set)); EV_WIN_FD_ZERO ((fd_set *)vec_wi);
   vec_wo  = ev_malloc (sizeof (fd_set));
   #ifdef _WIN32
   vec_eo  = ev_malloc (sizeof (fd_set));

data/lib/cool.io/version.rb

@@ -1,5 +1,5 @@
 module Coolio
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
   
   def self.version; VERSION; end
 end

data/spec/dns_spec.rb

@@ -36,4 +36,4 @@ describe "DNS" do
       @loop.run
     end.should raise_error(WontResolve)
   end
-end
+end

data/spec/tcp_server_spec.rb

@@ -105,7 +105,8 @@ ensure
   server.close
 end
 
-describe Coolio::TCPServer do
+# This test should work on Windows
+describe Coolio::TCPServer, :env => :win do
 
   it '#run' do
     test_run("hello").should == "hello"
@@ -128,3 +129,4 @@ describe Coolio::TCPServer do
   end
 
 end
+

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cool.io
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
+  prerelease: 
 platform: ruby
 authors:
 - Tony Arcieri
@@ -9,48 +10,54 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.6.0
 description: Cool.io provides a high performance event framework for Ruby which uses
@@ -65,9 +72,9 @@ extensions:
 - ext/iobuffer/extconf.rb
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -147,26 +154,33 @@ files:
 - spec/unix_server_spec.rb
 homepage: http://coolio.github.com
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2054079521512211321
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2054079521512211321
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A cool framework for doing high performance I/O in Ruby
 test_files:
 - spec/async_watcher_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 8df378d986336f5aa0c79e3c5e31f80a1571ab0d
-  data.tar.gz: 2d9c5aa507a285b4ee129c5a8ccfca8c5f5d8586
-SHA512:
-  metadata.gz: f6a74e7fa7dd6bd728835225ecb8481c2e44a44dad2887aaba7d041d835bdcb76ace90ea2fe4aab6bd5db322f3d9ea0c1e81e4eb68da4a3d75273fdcb6781d86
-  data.tar.gz: deaffe41d393672ffb44c81766460f8e0736a21294e96acabe998fe01ea36dbdd55ef6b1efadf1e675460ffc0be43376052f9a2f4e3344d36e7c8b37730a3bc5