kgio 2.5.0 → 2.6.0

data/.manifest

@@ -40,6 +40,7 @@ setup.rb
 test/lib_read_write.rb
 test/lib_server_accept.rb
 test/test_accept_class.rb
+test/test_accept_flags.rb
 test/test_autopush.rb
 test/test_connect_fd_leak.rb
 test/test_cross_thread_close.rb

data/ChangeLog

@@ -1,5 +1,62 @@
 ChangeLog from http://bogomips.org/kgio.git
 
+   commit dcaa9f9be83bfd59503033ae8f8eeca79c68c9df
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Thu Jul 14 18:54:37 2011 -0700
+   
+       kgio 2.6.0 - minor feature update and cleanups
+       
+       We now export SOCK_NONBLOCK, SOCK_CLOEXEC constants in the Kgio
+       namespace to make kgio_tryaccept/kgio_accept easier-to-use.
+       There are also some minor internal cleanups.
+   
+   commit 8baed92a7c02adcc913bcc7760b77a240b529c63
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Thu Jul 14 17:32:10 2011 -0700
+   
+       add prototype for rb_thread_blocking_io_region()
+       
+       It's no in the public headers, but Ruby 1.9.3 will have it and
+       it's still superior to rb_thread_blocking_region() even though
+       it's not ideal.
+   
+   commit 823f41d0f86dda497c166a839d8215275f5d48a0
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Thu Jul 14 17:29:57 2011 -0700
+   
+       missing_accept4: don't use FD_CLOEXEC for SOCK_CLOEXEC emulation
+       
+       It's too confusing and may break binary compatibility if the
+       system is later upgraded.
+   
+   commit 142beefba460685fea5b6646e1ba629f9ee207b3
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Thu Jul 14 17:29:05 2011 -0700
+   
+       accept.c: fix RDoc for new Kgio::SOCK_* constants
+       
+       We don't want people using the compatibility constants
+       since they're actually broken on systems with real accept4().
+   
+   commit c22f2b5ebccbca8e04aa22821964f67c4a81c675
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Wed Jul 6 19:11:47 2011 -0700
+   
+       export SOCK_NONBLOCK, SOCK_CLOEXEC constants in Kgio
+       
+       It's more reliable than relying on IO::NONBLOCK and
+       Fcntl::FD_CLOEXEC constants.  The existing constants are not
+       guaranteed to be equivalent to what accept4() takes even
+       though the current Linux implementation does it this way.
+   
+   commit 8e1a53f99a752d8ccba324560a9e52bf6e80680d
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Wed Jul 6 18:32:39 2011 -0700
+   
+       accept.c: reinstate errno after calling my_fileno()
+       
+       my_fileno() may change errno on some Rubies
+   
    commit e720827b48c3318627d1471ad4ec90d6166520fd
    Author: Eric Wong <normalperson@yhbt.net>
    Date:   Fri Jun 17 19:01:06 2011 -0700

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 2.5.0
+GIT_VERSION = 2.6.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.5.0.GIT
+DEF_VER=v2.6.0.GIT
 
 LF='
 '

data/LATEST

@@ -1,10 +1,6 @@
-=== kgio 2.5.0 - a minor feature update / 2011-06-20 19:30 UTC
+=== kgio 2.6.0 - minor feature update and cleanups / 2011-07-15 02:01 UTC
 
-  * Kgio::File.tryopen method added.  It is like File.open
-    but won't raise exceptions.  The Kgio::File class includes
-    Kgio::PipeMethods, so FIFOs opened through this get the
-    kgio_* API.
-
-  * The kgio_wait_*able methods in Kgio::DefaultWaiters
-    now accept an optional timeout argument.
+  We now export SOCK_NONBLOCK, SOCK_CLOEXEC constants in the Kgio
+  namespace to make kgio_tryaccept/kgio_accept easier-to-use.
+  There are also some minor internal cleanups.
 

data/NEWS

@@ -1,3 +1,9 @@
+=== kgio 2.6.0 - minor feature update and cleanups / 2011-07-15 02:01 UTC
+
+  We now export SOCK_NONBLOCK, SOCK_CLOEXEC constants in the Kgio
+  namespace to make kgio_tryaccept/kgio_accept easier-to-use.
+  There are also some minor internal cleanups.
+
 === kgio 2.5.0 - a minor feature update / 2011-06-20 19:30 UTC
 
   * Kgio::File.tryopen method added.  It is like File.open

data/ext/kgio/accept.c

@@ -204,6 +204,7 @@ retry:
 			if (force_nonblock)
 				return Qnil;
 			a->fd = my_fileno(a->accept_io);
+			errno = EAGAIN;
 			set_blocking_or_block(a->fd);
 #ifdef ECONNABORTED
 		case ECONNABORTED:
@@ -282,8 +283,8 @@ static VALUE addr_bang(VALUE io)
  * value of +Kgio.accept_cloexec+ and +Kgio.accept_nonblock+.  +flags+
  * is a bitmask that may contain any combination of:
  *
- * - Fcntl::FD_CLOEXEC - close-on-exec flag
- * - IO::NONBLOCK - non-blocking flag
+ * - Kgio::SOCK_CLOEXEC - close-on-exec flag
+ * - Kgio::SOCK_NONBLOCK - non-blocking flag
  */
 static VALUE tcp_tryaccept(int argc, VALUE *argv, VALUE self)
 {
@@ -319,8 +320,8 @@ static VALUE tcp_tryaccept(int argc, VALUE *argv, VALUE self)
  * value of +Kgio.accept_cloexec+ and +Kgio.accept_nonblock+.  +flags+
  * is a bitmask that may contain any combination of:
  *
- * - Fcntl::FD_CLOEXEC - close-on-exec flag
- * - IO::NONBLOCK - non-blocking flag
+ * - Kgio::SOCK_CLOEXEC - close-on-exec flag
+ * - Kgio::SOCK_NONBLOCK - non-blocking flag
  */
 static VALUE tcp_accept(int argc, VALUE *argv, VALUE self)
 {
@@ -353,8 +354,8 @@ static VALUE tcp_accept(int argc, VALUE *argv, VALUE self)
  * value of +Kgio.accept_cloexec+ and +Kgio.accept_nonblock+.  +flags+
  * is a bitmask that may contain any combination of:
  *
- * - Fcntl::FD_CLOEXEC - close-on-exec flag
- * - IO::NONBLOCK - non-blocking flag
+ * - Kgio::SOCK_CLOEXEC - close-on-exec flag
+ * - Kgio::SOCK_NONBLOCK - non-blocking flag
  */
 static VALUE unix_tryaccept(int argc, VALUE *argv, VALUE self)
 {
@@ -388,8 +389,8 @@ static VALUE unix_tryaccept(int argc, VALUE *argv, VALUE self)
  * value of +Kgio.accept_cloexec+ and +Kgio.accept_nonblock+.  +flags+
  * is a bitmask that may contain any combination of:
  *
- * - Fcntl::FD_CLOEXEC - close-on-exec flag
- * - IO::NONBLOCK - non-blocking flag
+ * - Kgio::SOCK_CLOEXEC - close-on-exec flag
+ * - Kgio::SOCK_NONBLOCK - non-blocking flag
  */
 static VALUE unix_accept(int argc, VALUE *argv, VALUE self)
 {
@@ -495,6 +496,18 @@ void init_kgio_accept(void)
 	VALUE cUNIXServer, cTCPServer;
 	VALUE mKgio = rb_define_module("Kgio");
 
+	/*
+	 * this maps to the SOCK_NONBLOCK constant in Linux for setting
+	 * the non-blocking flag on newly accepted sockets.
+	 */
+	rb_define_const(mKgio, "SOCK_NONBLOCK", INT2NUM(SOCK_NONBLOCK));
+
+	/*
+	 * this maps to the SOCK_CLOEXEC constant in Linux for setting
+	 * the close-on-exec flag on newly accepted descriptors.
+	 */
+	rb_define_const(mKgio, "SOCK_CLOEXEC", INT2NUM(SOCK_CLOEXEC));
+
 	localhost = rb_const_get(mKgio, rb_intern("LOCALHOST"));
 	cKgio_Socket = rb_const_get(mKgio, rb_intern("Socket"));
 	cClientSocket = cKgio_Socket;

data/ext/kgio/blocking_io_region.h

@@ -1,5 +1,8 @@
 #ifdef HAVE_RB_THREAD_BLOCKING_REGION
-#  ifndef HAVE_RB_THREAD_IO_BLOCKING_REGION
+#  ifdef HAVE_RB_THREAD_IO_BLOCKING_REGION
+/* temporary API for Ruby 1.9.3 */
+VALUE rb_thread_io_blocking_region(rb_blocking_function_t *, void *, int);
+#  else
 #    define rb_thread_io_blocking_region(fn,data,fd) \
             rb_thread_blocking_region((fn),(data),RUBY_UBF_IO,0)
 #  endif

data/ext/kgio/missing_accept4.h

@@ -5,11 +5,11 @@
 #  include <sys/types.h>
 #  include <sys/socket.h>
 #  ifndef SOCK_CLOEXEC
-#    if (FD_CLOEXEC == O_NONBLOCK)
+#    if (02000000 == O_NONBLOCK)
 #      define SOCK_CLOEXEC 1
 #      define SOCK_NONBLOCK 2
 #    else
-#      define SOCK_CLOEXEC FD_CLOEXEC
+#      define SOCK_CLOEXEC 02000000
 #      define SOCK_NONBLOCK O_NONBLOCK
 #    endif
 #  endif

data/test/test_accept_flags.rb

@@ -0,0 +1,49 @@
+require 'test/unit'
+require 'fcntl'
+require 'io/nonblock'
+$-w = true
+require 'kgio'
+
+class TestAcceptFlags < Test::Unit::TestCase
+  def test_accept_flags
+    @host = ENV["TEST_HOST"] || '127.0.0.1'
+    @srv = Kgio::TCPServer.new(@host, 0)
+    @port = @srv.addr[1]
+
+    client = TCPSocket.new(@host, @port)
+    accepted = @srv.kgio_accept(nil, Kgio::SOCK_NONBLOCK)
+    assert_instance_of Kgio::Socket, accepted
+    assert accepted.nonblock?
+    flags = accepted.fcntl(Fcntl::F_GETFD)
+    assert_equal 0, flags & Fcntl::FD_CLOEXEC
+    assert_nil client.close
+    assert_nil accepted.close
+
+    client = TCPSocket.new(@host, @port)
+    accepted = @srv.kgio_accept(nil, Kgio::SOCK_CLOEXEC)
+    assert_instance_of Kgio::Socket, accepted
+    assert ! accepted.nonblock?
+    flags = accepted.fcntl(Fcntl::F_GETFD)
+    assert_equal Fcntl::FD_CLOEXEC, flags & Fcntl::FD_CLOEXEC
+    assert_nil client.close
+    assert_nil accepted.close
+
+    client = TCPSocket.new(@host, @port)
+    accepted = @srv.kgio_accept(nil, Kgio::SOCK_CLOEXEC|Kgio::SOCK_NONBLOCK)
+    assert_instance_of Kgio::Socket, accepted
+    assert accepted.nonblock?
+    flags = accepted.fcntl(Fcntl::F_GETFD)
+    assert_equal Fcntl::FD_CLOEXEC, flags & Fcntl::FD_CLOEXEC
+    assert_nil client.close
+    assert_nil accepted.close
+
+    client = TCPSocket.new(@host, @port)
+    accepted = @srv.kgio_accept(nil, Kgio::SOCK_CLOEXEC|Kgio::SOCK_NONBLOCK)
+    assert_instance_of Kgio::Socket, accepted
+    assert accepted.nonblock?
+    flags = accepted.fcntl(Fcntl::F_GETFD)
+    assert_equal Fcntl::FD_CLOEXEC, flags & Fcntl::FD_CLOEXEC
+    assert_nil client.close
+    assert_nil accepted.close
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kgio
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 2
-  - 5
+  - 6
   - 0
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors: 
 - kgio hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 Z
+date: 2011-07-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: wrongdoc
@@ -118,6 +118,7 @@ files:
 - test/lib_read_write.rb
 - test/lib_server_accept.rb
 - test/test_accept_class.rb
+- test/test_accept_flags.rb
 - test/test_autopush.rb
 - test/test_connect_fd_leak.rb
 - test/test_cross_thread_close.rb
@@ -184,6 +185,7 @@ test_files:
 - test/test_unix_connect.rb
 - test/test_pipe_read_write.rb
 - test/test_unix_server.rb
+- test/test_accept_flags.rb
 - test/test_socketpair_read_write.rb
 - test/test_tcp_server.rb
 - test/test_unix_server_read_client_write.rb