kgio 2.6.0 → 2.7.0

data/.wrongdoc.yml

@@ -2,3 +2,5 @@
 cgit_url: http://bogomips.org/kgio.git
 git_url: git://bogomips.org/kgio.git
 rdoc_url: http://bogomips.org/kgio/
+public_email: kgio@librelist.org
+private_email: kgio@bogomips.org

data/GIT-VERSION-GEN

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

data/LICENSE

@@ -14,5 +14,5 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 License for more details.
 
 You should have received a copy of the GNU Lesser General Public License
-along with the GNU C Library; if not, write to the Free Software
+along with kgio; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301

data/TODO

@@ -1 +1 @@
-* SSL/TLS support with SNI
+* SSL/TLS support with SNI ({done}[http://bogomips.org/kgio-monkey/])

data/ext/kgio/accept.c

@@ -10,7 +10,7 @@ static VALUE cKgio_Socket;
 static VALUE mSocketMethods;
 static VALUE iv_kgio_addr;
 
-#if defined(__linux__)
+#if defined(__linux__) && defined(HAVE_RB_THREAD_BLOCKING_REGION)
 static int accept4_flags = SOCK_CLOEXEC;
 #else /* ! linux */
 static int accept4_flags = SOCK_CLOEXEC | SOCK_NONBLOCK;
@@ -125,6 +125,10 @@ static int thread_accept(struct accept_args *a, int force_nonblock)
 
 	/* always use non-blocking accept() under 1.8 for green threads */
 	set_nonblocking(a->fd);
+
+	/* created sockets are always non-blocking under 1.8, too */
+	a->flags |= SOCK_NONBLOCK;
+
 	TRAP_BEG;
 	rv = (int)xaccept(a);
 	TRAP_END;
@@ -279,12 +283,11 @@ static VALUE addr_bang(VALUE io)
  * An optional +klass+ argument may be specified to override the
  * Kgio::Socket-class on a successful return value.
  *
- * An optional +flags+ argument may also be specifed to override the
- * value of +Kgio.accept_cloexec+ and +Kgio.accept_nonblock+.  +flags+
- * is a bitmask that may contain any combination of:
+ * An optional +flags+ argument may also be specified.
+ * +flags+ is a bitmask that may contain any combination of:
  *
- * - Kgio::SOCK_CLOEXEC - close-on-exec flag
- * - Kgio::SOCK_NONBLOCK - non-blocking flag
+ * - Kgio::SOCK_CLOEXEC - close-on-exec flag (enabled by default)
+ * - Kgio::SOCK_NONBLOCK - non-blocking flag (unimportant)
  */
 static VALUE tcp_tryaccept(int argc, VALUE *argv, VALUE self)
 {
@@ -316,12 +319,11 @@ static VALUE tcp_tryaccept(int argc, VALUE *argv, VALUE self)
  * An optional +klass+ argument may be specified to override the
  * Kgio::Socket-class on a successful return value.
  *
- * An optional +flags+ argument may also be specifed to override the
- * value of +Kgio.accept_cloexec+ and +Kgio.accept_nonblock+.  +flags+
- * is a bitmask that may contain any combination of:
+ * An optional +flags+ argument may also be specified.
+ * +flags+ is a bitmask that may contain any combination of:
  *
- * - Kgio::SOCK_CLOEXEC - close-on-exec flag
- * - Kgio::SOCK_NONBLOCK - non-blocking flag
+ * - Kgio::SOCK_CLOEXEC - close-on-exec flag (enabled by default)
+ * - Kgio::SOCK_NONBLOCK - non-blocking flag (unimportant)
  */
 static VALUE tcp_accept(int argc, VALUE *argv, VALUE self)
 {
@@ -350,12 +352,11 @@ static VALUE tcp_accept(int argc, VALUE *argv, VALUE self)
  * An optional +klass+ argument may be specified to override the
  * Kgio::Socket-class on a successful return value.
  *
- * An optional +flags+ argument may also be specifed to override the
- * value of +Kgio.accept_cloexec+ and +Kgio.accept_nonblock+.  +flags+
- * is a bitmask that may contain any combination of:
+ * An optional +flags+ argument may also be specified.
+ * +flags+ is a bitmask that may contain any combination of:
  *
- * - Kgio::SOCK_CLOEXEC - close-on-exec flag
- * - Kgio::SOCK_NONBLOCK - non-blocking flag
+ * - Kgio::SOCK_CLOEXEC - close-on-exec flag (enabled by default)
+ * - Kgio::SOCK_NONBLOCK - non-blocking flag (unimportant)
  */
 static VALUE unix_tryaccept(int argc, VALUE *argv, VALUE self)
 {
@@ -385,12 +386,11 @@ static VALUE unix_tryaccept(int argc, VALUE *argv, VALUE self)
  * An optional +klass+ argument may be specified to override the
  * Kgio::Socket-class on a successful return value.
  *
- * An optional +flags+ argument may also be specifed to override the
- * value of +Kgio.accept_cloexec+ and +Kgio.accept_nonblock+.  +flags+
- * is a bitmask that may contain any combination of:
+ * An optional +flags+ argument may also be specified.
+ * +flags+ is a bitmask that may contain any combination of:
  *
- * - Kgio::SOCK_CLOEXEC - close-on-exec flag
- * - Kgio::SOCK_NONBLOCK - non-blocking flag
+ * - Kgio::SOCK_CLOEXEC - close-on-exec flag (enabled by default)
+ * - Kgio::SOCK_NONBLOCK - non-blocking flag (unimportant)
  */
 static VALUE unix_accept(int argc, VALUE *argv, VALUE self)
 {
@@ -409,6 +409,8 @@ static VALUE unix_accept(int argc, VALUE *argv, VALUE self)
  *
  * Returns true if newly accepted Kgio::Sockets are created with the
  * FD_CLOEXEC file descriptor flag, false if not.
+ *
+ * Deprecated, use the per-socket flags for kgio_*accept instead.
  */
 static VALUE get_cloexec(VALUE mod)
 {
@@ -423,6 +425,8 @@ static VALUE get_cloexec(VALUE mod)
  *
  * Returns true if newly accepted Kgio::Sockets are created with the
  * O_NONBLOCK file status flag, false if not.
+ *
+ * Deprecated, use the per-socket flags for kgio_*accept instead.
  */
 static VALUE get_nonblock(VALUE mod)
 {
@@ -444,6 +448,8 @@ static VALUE get_nonblock(VALUE mod)
  *
  * This is on by default, as there is little reason to deal to enable
  * it for client sockets on a socket server.
+ *
+ * Deprecated, use the per-socket flags for kgio_*accept instead.
  */
 static VALUE set_cloexec(VALUE mod, VALUE boolean)
 {
@@ -476,6 +482,10 @@ static VALUE set_cloexec(VALUE mod, VALUE boolean)
  * available (and on newer GNU/Linux, accept4() may also set
  * the non-blocking flag.  This defaults to +true+ on non-GNU/Linux
  * systems.
+ *
+ * This is always true on Ruby implementations using user-space threads.
+ *
+ * Deprecated, use the per-socket flags for kgio_*accept instead.
  */
 static VALUE set_nonblock(VALUE mod, VALUE boolean)
 {
@@ -497,14 +507,18 @@ void init_kgio_accept(void)
 	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.
+	 * Maps to the SOCK_NONBLOCK constant in Linux for setting
+	 * the non-blocking flag on newly accepted sockets.  This is
+	 * usually unnecessary as sockets are made non-blocking
+	 * whenever non-blocking methods are used.
 	 */
 	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.
+	 * Maps to the SOCK_CLOEXEC constant in Linux for setting
+	 * the close-on-exec flag on newly accepted descriptors.  This
+	 * is enabled by default, and there is usually no reason to
+	 * disable close-on-exec for accepted sockets.
 	 */
 	rb_define_const(mKgio, "SOCK_CLOEXEC", INT2NUM(SOCK_CLOEXEC));
 

data/ext/kgio/connect.c

@@ -9,16 +9,30 @@ static void close_fail(int fd, const char *msg)
 	rb_sys_fail(msg);
 }
 
-#ifdef SOCK_NONBLOCK
-#  define MY_SOCK_STREAM (SOCK_STREAM|SOCK_NONBLOCK)
+static int MY_SOCK_STREAM =
+#if defined(SOCK_NONBLOCK) && defined(SOCK_CLOEXEC)
+#  ifdef HAVE_RB_FD_FIX_CLOEXEC
+  (SOCK_STREAM|SOCK_NONBLOCK|SOCK_CLOEXEC)
+#  else
+  (SOCK_STREAM|SOCK_NONBLOCK)
+#  endif
 #else
-#  define MY_SOCK_STREAM SOCK_STREAM
+  SOCK_STREAM
 #endif /* ! SOCK_NONBLOCK */
+;
+
+/* do not set close-on-exec by default on Ruby <2.0.0 */
+#ifndef HAVE_RB_FD_FIX_CLOEXEC
+#  define rb_fd_fix_cloexec(fd) for (;0;)
+#endif /* HAVE_RB_FD_FIX_CLOEXEC */
 
 static VALUE
 my_connect(VALUE klass, int io_wait, int domain, void *addr, socklen_t addrlen)
 {
-	int fd = socket(domain, MY_SOCK_STREAM, 0);
+	int fd;
+
+retry:
+	fd = socket(domain, MY_SOCK_STREAM, 0);
 
 	if (fd == -1) {
 		switch (errno) {
@@ -30,15 +44,22 @@ my_connect(VALUE klass, int io_wait, int domain, void *addr, socklen_t addrlen)
 			errno = 0;
 			rb_gc();
 			fd = socket(domain, MY_SOCK_STREAM, 0);
+			break;
+		case EINVAL:
+			if (MY_SOCK_STREAM != SOCK_STREAM) {
+				MY_SOCK_STREAM = SOCK_STREAM;
+				goto retry;
+			}
 		}
 		if (fd == -1)
 			rb_sys_fail("socket");
 	}
 
-#ifndef SOCK_NONBLOCK
-	if (fcntl(fd, F_SETFL, O_RDWR | O_NONBLOCK) == -1)
-		close_fail(fd, "fcntl(F_SETFL, O_RDWR | O_NONBLOCK)");
-#endif /* SOCK_NONBLOCK */
+	if (MY_SOCK_STREAM == SOCK_STREAM) {
+		if (fcntl(fd, F_SETFL, O_RDWR | O_NONBLOCK) == -1)
+			close_fail(fd, "fcntl(F_SETFL, O_RDWR | O_NONBLOCK)");
+		rb_fd_fix_cloexec(fd);
+	}
 
 	if (connect(fd, addr, addrlen) == -1) {
 		if (errno == EINPROGRESS) {
@@ -63,7 +84,11 @@ static VALUE tcp_connect(VALUE klass, VALUE ip, VALUE port, int io_wait)
 	struct addrinfo *res;
 	const char *ipname = StringValuePtr(ip);
 	char ipport[6];
-	unsigned uport = FIX2UINT(port);
+	unsigned uport;
+
+	if (TYPE(port) != T_FIXNUM)
+		rb_raise(rb_eTypeError, "port must be a non-negative integer");
+	uport = FIX2UINT(port);
 
 	rc = snprintf(ipport, sizeof(ipport), "%u", uport);
 	if (rc >= (int)sizeof(ipport) || rc <= 0)

data/ext/kgio/extconf.rb

@@ -41,6 +41,9 @@ have_type("struct RFile", rubyio) and check_sizeof("struct RFile", rubyio)
 have_type("struct RObject") and check_sizeof("struct RObject")
 check_sizeof("int")
 have_func('rb_io_ascii8bit_binmode')
+have_func('rb_update_max_fd')
+have_func('rb_fd_fix_cloexec')
+have_func('rb_cloexec_open')
 have_func('rb_thread_blocking_region')
 have_func('rb_thread_io_blocking_region')
 have_func('rb_str_set_len')

data/ext/kgio/kgio.h

@@ -46,4 +46,7 @@ VALUE kgio_call_wait_readable(VALUE io);
 #  define USE_KGIO_POLL
 #endif /* USE_KGIO_POLL */
 
+#ifndef HAVE_RB_UPDATE_MAX_FD
+#  define rb_update_max_fd(fd) for (;0;)
+#endif
 #endif /* KGIO_H */

data/ext/kgio/sock_for_fd.h

@@ -29,9 +29,11 @@
 #if SOCK_FOR_FD == 19  /* modeled after ext/socket/init.c */
 static VALUE sock_for_fd(VALUE klass, int fd)
 {
-	VALUE sock = rb_obj_alloc(klass);
+	VALUE sock;
 	rb_io_t *fp;
 
+	rb_update_max_fd(fd); /* 1.9.3+ API */
+	sock = rb_obj_alloc(klass);
 	MakeOpenFile(sock, fp);
 	fp->fd = fd;
 	fp->mode = FMODE_READWRITE|FMODE_DUPLEX|FMODE_NOREVLOOKUP;

data/ext/kgio/tryopen.c

@@ -25,11 +25,15 @@ struct open_args {
 	mode_t mode;
 };
 
+#ifndef HAVE_RB_CLOEXEC_OPEN
+#  define rb_cloexec_open(p,f,m) open((p),(f),(m))
+#endif
+
 static VALUE nogvl_open(void *ptr)
 {
 	struct open_args *o = ptr;
 
-	return (VALUE)open(o->pathname, o->flags, o->mode);
+	return (VALUE)rb_cloexec_open(o->pathname, o->flags, o->mode);
 }
 
 #ifndef HAVE_RB_THREAD_BLOCKING_REGION

data/ext/kgio/wait.c

@@ -68,7 +68,7 @@ static VALUE kgio_wait_readable(int argc, VALUE *argv, VALUE self)
 /*
  * call-seq:
  *
- *	io.kgio_wait_writeable          -> IO
+ *	io.kgio_wait_writable           -> IO
  *	io.kgio_wait_writable(timeout)  -> IO or nil
  *
  * Blocks the running Thread indefinitely until the IO object is writable

data/test/lib_server_accept.rb

@@ -25,7 +25,6 @@ module LibServerAccept
     IO.select([@srv])
     b = @srv.kgio_tryaccept nil, 0
     assert_kind_of Kgio::Socket, b
-    assert_equal false, b.nonblock?
     assert_equal 0, b.fcntl(Fcntl::F_GETFD)
   end
 
@@ -34,7 +33,6 @@ module LibServerAccept
     IO.select([@srv])
     b = @srv.kgio_accept nil, 0
     assert_kind_of Kgio::Socket, b
-    assert_equal false, b.nonblock?
     assert_equal 0, b.fcntl(Fcntl::F_GETFD)
   end
 

data/test/test_accept_flags.rb

@@ -13,7 +13,6 @@ class TestAcceptFlags < Test::Unit::TestCase
     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
@@ -22,7 +21,6 @@ class TestAcceptFlags < Test::Unit::TestCase
     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
@@ -31,7 +29,6 @@ class TestAcceptFlags < Test::Unit::TestCase
     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
@@ -40,7 +37,6 @@ class TestAcceptFlags < Test::Unit::TestCase
     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

data/test/test_poll.rb

@@ -53,6 +53,19 @@ class TestPoll < Test::Unit::TestCase
     assert diff >= 0.010, "diff=#{diff}"
   end
 
+  def test_signal_close
+    orig = trap(:USR1) { @rd.close }
+    res = nil
+    thr = Thread.new { sleep 0.100; Process.kill(:USR1, $$) }
+    t0 = Time.now
+    assert_raises(IOError) { Kgio.poll({@rd => Kgio::POLLIN}) }
+    diff = Time.now - t0
+    thr.join
+    assert diff >= 0.010, "diff=#{diff}"
+    ensure
+      trap(:USR1, orig)
+  end
+
   def test_poll_EINTR
     ok = false
     orig = trap(:USR1) { ok = true }

data/test/test_tcp_connect.rb

@@ -31,10 +31,17 @@ class TestKgioTcpConnect < Test::Unit::TestCase
     ready = IO.select(nil, [ sock ])
     assert_equal sock, ready[1][0]
     assert_equal nil, sock.kgio_write("HELLO")
+
+    sock.respond_to?(:close_on_exec?) and
+      assert_equal(RUBY_VERSION.to_f >= 2.0, sock.close_on_exec?)
   end
 
   def test_start
     sock = Kgio::Socket.start(@addr)
+
+    sock.respond_to?(:close_on_exec?) and
+      assert_equal(RUBY_VERSION.to_f >= 2.0, sock.close_on_exec?)
+
     assert_kind_of Kgio::Socket, sock
     ready = IO.select(nil, [ sock ])
     assert_equal sock, ready[1][0]
@@ -50,6 +57,10 @@ class TestKgioTcpConnect < Test::Unit::TestCase
 
   def test_tcp_socket_new
     sock = Kgio::TCPSocket.new(@host, @port)
+
+    sock.respond_to?(:close_on_exec?) and
+      assert_equal(RUBY_VERSION.to_f >= 2.0, sock.close_on_exec?)
+
     assert_instance_of Kgio::TCPSocket, sock
     ready = IO.select(nil, [ sock ])
     assert_equal sock, ready[1][0]

data/test/test_tryopen.rb

@@ -7,6 +7,10 @@ class TestTryopen < Test::Unit::TestCase
 
   def test_tryopen_success
     tmp = Kgio::File.tryopen(__FILE__)
+
+    tmp.respond_to?(:close_on_exec?) and
+      assert_equal(RUBY_VERSION.to_f >= 2.0, tmp.close_on_exec?)
+
     assert_kind_of File, tmp
     assert_equal File.read(__FILE__), tmp.read
     assert_equal __FILE__, tmp.path

data/test/test_unix_connect.rb

@@ -34,6 +34,10 @@ class TestKgioUnixConnect < Test::Unit::TestCase
 
   def test_unix_socket_new
     sock = Kgio::UNIXSocket.new(@path)
+
+    sock.respond_to?(:close_on_exec?) and
+      assert_equal(RUBY_VERSION.to_f >= 2.0, sock.close_on_exec?)
+
     assert_instance_of Kgio::UNIXSocket, sock
     ready = IO.select(nil, [ sock ])
     assert_equal sock, ready[1][0]
@@ -42,6 +46,10 @@ class TestKgioUnixConnect < Test::Unit::TestCase
 
   def test_new
     sock = Kgio::Socket.new(@addr)
+
+    sock.respond_to?(:close_on_exec?) and
+      assert_equal(RUBY_VERSION.to_f >= 2.0, sock.close_on_exec?)
+
     assert_instance_of Kgio::Socket, sock
     ready = IO.select(nil, [ sock ])
     assert_equal sock, ready[1][0]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kgio
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 2
-  - 6
+  - 7
   - 0
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors: 
 - kgio hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 Z
+date: 2011-12-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: wrongdoc
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.8.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: kinder, gentler I/O for Ruby