kgio 2.8.1 → 2.9.0

data/.manifest

@@ -28,11 +28,13 @@ ext/kgio/missing_accept4.h
 ext/kgio/my_fileno.h
 ext/kgio/nonblock.h
 ext/kgio/poll.c
-ext/kgio/read_write.c
+ext/kgio/read.c
 ext/kgio/set_file_path.h
 ext/kgio/sock_for_fd.h
 ext/kgio/tryopen.c
 ext/kgio/wait.c
+ext/kgio/write.c
+ext/kgio/writev.c
 kgio.gemspec
 lib/kgio.rb
 pkg.mk
@@ -54,6 +56,7 @@ test/test_poll.rb
 test/test_singleton_read_write.rb
 test/test_socket.rb
 test/test_socketpair_read_write.rb
+test/test_syssend.rb
 test/test_tcp6_client_read_server_write.rb
 test/test_tcp_client_read_server_write.rb
 test/test_tcp_connect.rb

data/ChangeLog

@@ -1,5 +1,157 @@
 ChangeLog from http://bogomips.org/kgio.git
 
+   commit cbba2690a75830d68c1db779a1c15ecad3725528
+   Author: Eric Wong <e@80x24.org>
+   Date:   Tue Feb 4 03:06:42 2014 +0000
+   
+       kgio 2.9.0 - cleanups, bug fixes, minor improvements
+       
+       This adds a new kgio_syssend method for Ruby 1.9+ which behaves
+       like BasicSocket#send, but will not raise exceptions on EAGAIN.
+       
+       Eric Wong (12):
+             test_poll: remove race prone test_poll_EINTR_changed test
+             tryopen: remove RARRAY_PTR usage in init
+             read_write: remove the rest of RARRAY_PTR usage
+             my_writev: stylistic fixes
+             Rakefile: kill raa_update task
+             avoid downsizing casts
+             connect: constify RSTRING-related things
+             set RSTRING_MODIFIED where appropriate for Rubinius
+             split read_write.c into {read,write,writev}.c
+             add kgio_syssend method to wrap send(2)
+             write: correct check for various blocking regions
+             tryopen: additional debug information for bad Errno values
+       
+       Hleb Valoshka (1):
+             Don't use deprecated api
+   
+   commit f991debdcc3cbba721029285e4a77f32d8222aa1
+   Author: Eric Wong <e@80x24.org>
+   Date:   Tue Feb 4 03:01:46 2014 +0000
+   
+       tryopen: additional debug information for bad Errno values
+       
+       In case users run into the same problem in the future.
+       ref: http://mid.gmane.org/20131227074129.GA6381@dcvr.yhbt.net
+   
+   commit cf4c09c3f280850cd5a018d603e9df08ce54ade2
+   Author: Eric Wong <e@80x24.org>
+   Date:   Tue Feb 4 02:42:51 2014 +0000
+   
+       write: correct check for various blocking regions
+       
+       This will allow us to support past/future Rubies without
+       rb_thread_io_blocking_region but still have other ways
+       of releasing GVL.
+   
+   commit 070b5aeb9313ef09303dffa7bc72c771f6f86f31
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Tue Feb 4 00:51:59 2014 +0000
+   
+       add kgio_syssend method to wrap send(2)
+       
+       This behaves like kgio_trywrite on GNU/Linux, but allows extra flags
+       to be specified.  The main purpose of this is to support use of the
+       MSG_MORE flag on GNU/Linux.
+   
+   commit a876a30e4bfae6e3aa4af2e34f68bf66be5715b4
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Thu Nov 21 21:18:45 2013 +0000
+   
+       split read_write.c into {read,write,writev}.c
+       
+       This helps make our code more manageable, as well as isolating
+       RSTRING_MODIFIED usage to files which actually need it.
+       writev.c can eventually be fixed to avoid modifying RSTRING
+       pointers, but write.c can already benefit from const RSTRING_PTR
+       values right away.
+   
+   commit 8788e248f9978da6708dd1e85d40531bb30d0bb2
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Thu Nov 21 19:05:23 2013 +0000
+   
+       set RSTRING_MODIFIED where appropriate for Rubinius
+       
+       Not yet tested, but it makes sense to do this.
+   
+   commit 7a49e4df0a8f23594a83f21f2fd54955dcb6a0fc
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Thu Nov 21 18:57:09 2013 +0000
+   
+       connect: constify RSTRING-related things
+       
+       This should enforce correctness with our non-use of RSTRING_MODIFIED
+       in this file, hopefully allowing Rubinius to optimize better.
+   
+   commit 809b9716a2593c0bfcaa115e7e560615c6357b55
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Mon Jan 20 21:16:14 2014 +0000
+   
+       avoid downsizing casts
+       
+       It's always safe to cast a 32-bit value to a 64-bit value, but
+       compilers can warn going the other way (because VALUE is a pointer).
+       
+       Tested with `ruby -v`
+       ruby 2.2.0dev (2014-01-19 trunk 44646) [x86_64-linux]
+       which enables -Wpointer-to-int-cast
+   
+   commit 008483785d1a5bb801219af8afbb77be18b9bef1
+   Author: Hleb Valoshka <375gnu@gmail.com>
+   Date:   Mon Jan 20 22:36:19 2014 +0300
+   
+       Don't use deprecated api
+       
+       Signed-off-by: Eric Wong <normalperson@yhbt.net>
+   
+   commit a8cb03f58be2c2742f0030a28a9e8454c3d56634
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Mon Sep 30 18:22:43 2013 +0000
+   
+       Rakefile: kill raa_update task
+       
+       RAA is dead
+   
+   commit fc91f1d424af2a94d0fbed4b1f4d0171c8add79f
+   Author: Eric Wong <e@yhbt.net>
+   Date:   Wed Sep 25 19:37:22 2013 +0000
+   
+       my_writev: stylistic fixes
+       
+       Rename 'str' to 'ary', as that's the whole point of supporting
+       writev...  Also, long lines need to be wrapped at 80 columns
+   
+   commit 13725d97e0c493cc38a4c833c1053216fb5c799b
+   Author: Eric Wong <e@yhbt.net>
+   Date:   Wed Sep 25 19:26:26 2013 +0000
+   
+       read_write: remove the rest of RARRAY_PTR usage
+       
+       I have not benchmarked this, but this should not make a difference
+       as far as performance goes.  This should also allow better
+       performance of better GCs in Ruby 2.1.0 and Rubinius.
+   
+   commit e0d3b3cbe90b47facf0e67036429502ad8f99c49
+   Author: Eric Wong <e@yhbt.net>
+   Date:   Wed Sep 25 19:20:11 2013 +0000
+   
+       tryopen: remove RARRAY_PTR usage in init
+       
+       This is trivially non-performance-critical, and can only
+       help with advanced GCs in Ruby 2.1.0 and Rubinius
+   
+   commit 98bbc4bd1fda4aa7fddcb57db659bb3e507238e7
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Wed Sep 25 17:42:17 2013 +0000
+   
+       test_poll: remove race prone test_poll_EINTR_changed test
+       
+       We haven't figured out a way to reliably test this w/o races, so lets
+       just remove it for now and trust it works by reading the C code.
+       
+       ref: <CAAB-KcnpvcG6=OZNsBmvv440OHfCWs6-eDD7L6oD=ziCRXPHLA@mail.gmail.com>
+   
    commit 9bde3ab9a7e6e1776ba43bd0e7a3e9202f1026f6
    Author: Eric Wong <normalperson@yhbt.net>
    Date:   Wed Sep 11 00:01:21 2013 +0000

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 2.8.1
+GIT_VERSION = 2.9.0

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -5,6 +5,5 @@ rfpackage := kgio
 include pkg.mk
 ifneq ($(VERSION),)
 release::
-	$(RAKE) raa_update VERSION=$(VERSION)
 	$(RAKE) publish_news VERSION=$(VERSION)
 endif

data/LATEST

@@ -1,24 +1,22 @@
-=== kgio 2.8.1 - minor improvements and test fixes / 2013-09-11 00:22 UTC
+=== kgio 2.9.0 - cleanups, bug fixes, minor improvements / 2014-02-04 03:09 UTC
 
-  Improved error reporting for kgio_accept/kgio_tryaccept.
-  Minor size reduction throughout.  There are also several
-  test case fixes for race conditions.
+  This adds a new kgio_syssend method for Ruby 1.9+ which behaves
+  like BasicSocket#send, but will not raise exceptions on EAGAIN.
 
-  Thanks to Hleb Valoshka and the Debian project for all the
-  help with this release!
+  Eric Wong (12):
+        test_poll: remove race prone test_poll_EINTR_changed test
+        tryopen: remove RARRAY_PTR usage in init
+        read_write: remove the rest of RARRAY_PTR usage
+        my_writev: stylistic fixes
+        Rakefile: kill raa_update task
+        avoid downsizing casts
+        connect: constify RSTRING-related things
+        set RSTRING_MODIFIED where appropriate for Rubinius
+        split read_write.c into {read,write,writev}.c
+        add kgio_syssend method to wrap send(2)
+        write: correct check for various blocking regions
+        tryopen: additional debug information for bad Errno values
 
-  Eric Wong (7):
-        check syscall returns against < 0 instead of == -1
-        accept: more informative exception on unknown family
-        test_tryopen: skip EACCES test when euid == 0
-        test/lib_read_write: account for larger-than-normal pipes
-        test_poll: avoid potentially thread-unsafe test
-        test_poll: preserve original trap(:USR1) handler
-        test_poll: be less dependent on signal handler ordering
-
-  Hleb Valoshka (4):
-        Change prefix of temporary sockets to prevent races
-        Don't dump 20M in case of failure
-        Create own directory for every unix socket in unit tests
-        Close tempfile and unlink it immediately.
+  Hleb Valoshka (1):
+        Don't use deprecated api
 

data/NEWS

@@ -1,3 +1,25 @@
+=== kgio 2.9.0 - cleanups, bug fixes, minor improvements / 2014-02-04 03:09 UTC
+
+  This adds a new kgio_syssend method for Ruby 1.9+ which behaves
+  like BasicSocket#send, but will not raise exceptions on EAGAIN.
+
+  Eric Wong (12):
+        test_poll: remove race prone test_poll_EINTR_changed test
+        tryopen: remove RARRAY_PTR usage in init
+        read_write: remove the rest of RARRAY_PTR usage
+        my_writev: stylistic fixes
+        Rakefile: kill raa_update task
+        avoid downsizing casts
+        connect: constify RSTRING-related things
+        set RSTRING_MODIFIED where appropriate for Rubinius
+        split read_write.c into {read,write,writev}.c
+        add kgio_syssend method to wrap send(2)
+        write: correct check for various blocking regions
+        tryopen: additional debug information for bad Errno values
+
+  Hleb Valoshka (1):
+        Don't use deprecated api
+
 === kgio 2.8.1 - minor improvements and test fixes / 2013-09-11 00:22 UTC
 
   Improved error reporting for kgio_accept/kgio_tryaccept.

data/Rakefile

@@ -30,40 +30,3 @@ task :publish_news do
   rf.login
   rf.post_news('rainbows', subject, body)
 end
-
-desc "post to RAA"
-task :raa_update do
-  require 'net/http'
-  require 'net/netrc'
-  rc = Net::Netrc.locate('kgio-raa') or abort "~/.netrc not found"
-  password = rc.password
-
-  s = Gem::Specification.load('kgio.gemspec')
-  desc = [ s.description.strip ]
-  desc << ""
-  desc << "* #{s.email}"
-  desc << "* #{git_url}"
-  desc << "* #{cgit_url}"
-  desc = desc.join("\n")
-  uri = URI.parse('http://raa.ruby-lang.org/regist.rhtml')
-  form = {
-    :name => s.name,
-    :short_description => s.summary,
-    :version => s.version.to_s,
-    :status => 'experimental',
-    :owner => s.authors.first,
-    :email => s.email,
-    :category_major => 'Library',
-    :category_minor => 'System',
-    :url => s.homepage,
-    :download => 'http://rubyforge.org/frs/?group_id=8977',
-    :license => "LGPL",
-    :description_style => 'Plain',
-    :description => desc,
-    :pass => password,
-    :submit => 'Update',
-  }
-  res = Net::HTTP.post_form(uri, form)
-  p res
-  puts res.body
-end

data/ext/kgio/accept.c

@@ -1,3 +1,6 @@
+/* ref: rubinius b2811f260de16d1e972462e27852470364608de5 */
+#define RSTRING_MODIFIED 1
+
 #include "kgio.h"
 #include "missing_accept4.h"
 #include "sock_for_fd.h"
@@ -10,7 +13,7 @@ static VALUE cKgio_Socket;
 static VALUE mSocketMethods;
 static VALUE iv_kgio_addr;
 
-#if defined(__linux__) && defined(HAVE_RB_THREAD_BLOCKING_REGION)
+#if defined(__linux__) && defined(KGIO_HAVE_THREAD_CALL_WITHOUT_GVL)
 static int accept4_flags = SOCK_CLOEXEC;
 #else /* ! linux */
 static int accept4_flags = SOCK_CLOEXEC | SOCK_NONBLOCK;
@@ -76,7 +79,7 @@ static VALUE xaccept(void *ptr)
 	return (VALUE)rv;
 }
 
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+#ifdef KGIO_HAVE_THREAD_CALL_WITHOUT_GVL
 #  include <time.h>
 #  include "blocking_io_region.h"
 static int thread_accept(struct accept_args *a, int force_nonblock)
@@ -86,7 +89,7 @@ static int thread_accept(struct accept_args *a, int force_nonblock)
 	return (int)rb_thread_io_blocking_region(xaccept, a, a->fd);
 }
 
-#else /* ! HAVE_RB_THREAD_BLOCKING_REGION */
+#else /* ! KGIO_HAVE_THREAD_CALL_WITHOUT_GVL */
 #  include <rubysig.h>
 static int thread_accept(struct accept_args *a, int force_nonblock)
 {
@@ -103,7 +106,7 @@ static int thread_accept(struct accept_args *a, int force_nonblock)
 	TRAP_END;
 	return rv;
 }
-#endif /* ! HAVE_RB_THREAD_BLOCKING_REGION */
+#endif /* ! KGIO_HAVE_THREAD_CALL_WITHOUT_GVL */
 
 static void
 prepare_accept(struct accept_args *a, VALUE self, int argc, const VALUE *argv)

data/ext/kgio/ancient_ruby.h

@@ -17,9 +17,6 @@ static void my_str_set_len(VALUE str, long len)
 #  define RSTRING_LEN(s) (RSTRING(s)->len)
 #endif /* !defined(RSTRING_LEN) */
 
-#ifndef RARRAY_PTR
-#  define RARRAY_PTR(s) (RARRAY(s)->ptr)
-#endif /* !defined(RARRAY_PTR) */
 #ifndef RARRAY_LEN
 #  define RARRAY_LEN(s) (RARRAY(s)->len)
 #endif /* !defined(RARRAY_LEN) */

data/ext/kgio/blocking_io_region.h

@@ -1,8 +1,11 @@
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
-#  ifdef HAVE_RB_THREAD_IO_BLOCKING_REGION
+#ifdef KGIO_HAVE_THREAD_CALL_WITHOUT_GVL
+#  if   defined(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
+#  elif defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+#    define rb_thread_io_blocking_region(fn,data,fd) \
+            rb_thread_call_without_gvl((fn),(data),RUBY_UBF_IO,0)
+#  elif defined(HAVE_RB_THREAD_BLOCKING_REGION)
 #    define rb_thread_io_blocking_region(fn,data,fd) \
             rb_thread_blocking_region((fn),(data),RUBY_UBF_IO,0)
 #  endif

data/ext/kgio/connect.c

@@ -1,3 +1,4 @@
+/* We do not modify RSTRING in this file, so RSTRING_MODIFIED is not needed */
 #include "kgio.h"
 #include "my_fileno.h"
 #include "sock_for_fd.h"
@@ -67,7 +68,8 @@ retry:
 }
 
 static VALUE
-my_connect(VALUE klass, int io_wait, int domain, void *addr, socklen_t addrlen)
+my_connect(VALUE klass, int io_wait, int domain,
+	const void *addr, socklen_t addrlen)
 {
 	int fd = my_socket(domain);
 
@@ -133,25 +135,25 @@ static VALUE tcp_connect(VALUE klass, VALUE ip, VALUE port, int io_wait)
 	                  &addr, hints.ai_addrlen);
 }
 
-static struct sockaddr *sockaddr_from(socklen_t *addrlen, VALUE addr)
+static const struct sockaddr *sockaddr_from(socklen_t *addrlen, VALUE addr)
 {
 	if (TYPE(addr) == T_STRING) {
 		*addrlen = (socklen_t)RSTRING_LEN(addr);
-		return (struct sockaddr *)(RSTRING_PTR(addr));
+		return (const struct sockaddr *)(RSTRING_PTR(addr));
 	}
 	rb_raise(rb_eTypeError, "invalid address");
 	return NULL;
 }
 
-#if defined(MSG_FASTOPEN) && defined(HAVE_RB_THREAD_BLOCKING_REGION)
+#if defined(MSG_FASTOPEN) && defined(KGIO_HAVE_THREAD_CALL_WITHOUT_GVL)
 #ifndef HAVE_RB_STR_SUBSEQ
 #define rb_str_subseq rb_str_substr
 #endif
 struct tfo_args {
 	int fd;
-	void *buf;
+	const void *buf;
 	size_t buflen;
-	struct sockaddr *addr;
+	const struct sockaddr *addr;
 	socklen_t addrlen;
 };
 
@@ -296,9 +298,9 @@ static VALUE stream_connect(VALUE klass, VALUE addr, int io_wait)
 {
 	int domain;
 	socklen_t addrlen;
-	struct sockaddr *sockaddr = sockaddr_from(&addrlen, addr);
+	const struct sockaddr *sockaddr = sockaddr_from(&addrlen, addr);
 
-	switch (((struct sockaddr_storage *)(sockaddr))->ss_family) {
+	switch (((const struct sockaddr_storage *)(sockaddr))->ss_family) {
 	case AF_UNIX: domain = PF_UNIX; break;
 	case AF_INET: domain = PF_INET; break;
 	case AF_INET6: domain = PF_INET6; break;
@@ -381,7 +383,7 @@ void init_kgio_connect(void)
 	rb_define_singleton_method(cKgio_Socket, "new", kgio_new, -1);
 	rb_define_singleton_method(cKgio_Socket, "connect", kgio_connect, 1);
 	rb_define_singleton_method(cKgio_Socket, "start", kgio_start, 1);
-#if defined(MSG_FASTOPEN) && defined(HAVE_RB_THREAD_BLOCKING_REGION)
+#if defined(MSG_FASTOPEN) && defined(KGIO_HAVE_THREAD_CALL_WITHOUT_GVL)
 	rb_define_method(cKgio_Socket, "kgio_fastopen", fastopen, 2);
 #endif
 	/*

data/ext/kgio/extconf.rb

@@ -46,6 +46,8 @@ have_func('rb_io_ascii8bit_binmode')
 have_func('rb_update_max_fd')
 have_func('rb_fd_fix_cloexec')
 have_func('rb_cloexec_open')
+have_header('ruby/thread.h')
+have_func('rb_thread_call_without_gvl', %w{ruby/thread.h})
 have_func('rb_thread_blocking_region')
 have_func('rb_thread_io_blocking_region')
 have_func('rb_str_set_len')

data/ext/kgio/kgio.h

@@ -7,6 +7,9 @@
 #else
 #  include <rubyio.h>
 #endif
+#ifdef HAVE_RUBY_THREAD_H
+#  include <ruby/thread.h>
+#endif
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -20,16 +23,10 @@
 
 #include "ancient_ruby.h"
 
-struct io_args {
-	VALUE io;
-	VALUE buf;
-	char *ptr;
-	long len;
-	int fd;
-};
-
 void init_kgio_wait(void);
-void init_kgio_read_write(void);
+void init_kgio_read(void);
+void init_kgio_write(void);
+void init_kgio_writev(void);
 void init_kgio_accept(void);
 void init_kgio_connect(void);
 void init_kgio_autopush(void);
@@ -42,7 +39,16 @@ void kgio_autopush_send(VALUE);
 
 VALUE kgio_call_wait_writable(VALUE io);
 VALUE kgio_call_wait_readable(VALUE io);
-#if defined(HAVE_RB_THREAD_BLOCKING_REGION) && defined(HAVE_POLL)
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+#  define KGIO_HAVE_THREAD_CALL_WITHOUT_GVL 1
+typedef  void *(*kgio_blocking_fn_t)(void*);
+#  define rb_thread_blocking_region(fn,data1,ubf,data2) \
+          rb_thread_call_without_gvl((kgio_blocking_fn_t)(fn),(data1),(ubf),(data2))
+#elif defined(HAVE_RB_THREAD_BLOCKING_REGION)
+#  define KGIO_HAVE_THREAD_CALL_WITHOUT_GVL 1
+#endif /* HAVE_RB_THREAD_CALL_WITHOUT_GVL || HAVE_RB_THREAD_BLOCKING_REGION */
+
+#if defined(KGIO_HAVE_THREAD_CALL_WITHOUT_GVL) && defined(HAVE_POLL)
 #  define USE_KGIO_POLL
 #endif /* USE_KGIO_POLL */
 
@@ -71,5 +77,23 @@ VALUE kgio_call_wait_readable(VALUE io);
 #endif
 
 extern unsigned kgio_tfo;
+NORETURN(void kgio_raise_empty_bt(VALUE, const char *));
+NORETURN(void kgio_wr_sys_fail(const char *));
+NORETURN(void kgio_rd_sys_fail(const char *));
 
+/*
+ * we know MSG_DONTWAIT works properly on all stream sockets under Linux
+ * we can define this macro for other platforms as people care and
+ * notice.
+ */
+#  if defined(__linux__)
+#    define USE_MSG_DONTWAIT
+#  endif
+
+#ifdef USE_MSG_DONTWAIT
+/* we don't need these variants, we call kgio_autopush_send/recv directly */
+static inline void kgio_autopush_write(VALUE io) { }
+#else
+static inline void kgio_autopush_write(VALUE io) { kgio_autopush_send(io); }
+#endif
 #endif /* KGIO_H */

data/ext/kgio/kgio_ext.c

@@ -3,6 +3,8 @@
 #include <stdio.h>
 /* true if TCP Fast Open is usable */
 unsigned kgio_tfo;
+static VALUE eErrno_EPIPE, eErrno_ECONNRESET;
+static ID id_set_backtrace;
 
 static void tfo_maybe(void)
 {
@@ -34,11 +36,63 @@ static void tfo_maybe(void)
 #endif
 }
 
+void kgio_raise_empty_bt(VALUE err, const char *msg)
+{
+	VALUE exc = rb_exc_new2(err, msg);
+	VALUE bt = rb_ary_new();
+
+	rb_funcall(exc, id_set_backtrace, 1, bt);
+	rb_exc_raise(exc);
+}
+
+void kgio_wr_sys_fail(const char *msg)
+{
+	switch (errno) {
+	case EPIPE:
+		errno = 0;
+		kgio_raise_empty_bt(eErrno_EPIPE, msg);
+	case ECONNRESET:
+		errno = 0;
+		kgio_raise_empty_bt(eErrno_ECONNRESET, msg);
+	}
+	rb_sys_fail(msg);
+}
+
+void kgio_rd_sys_fail(const char *msg)
+{
+	if (errno == ECONNRESET) {
+		errno = 0;
+		kgio_raise_empty_bt(eErrno_ECONNRESET, msg);
+	}
+	rb_sys_fail(msg);
+}
+
 void Init_kgio_ext(void)
 {
+	VALUE mKgio = rb_define_module("Kgio");
+	VALUE mPipeMethods = rb_define_module_under(mKgio, "PipeMethods");
+	VALUE mSocketMethods = rb_define_module_under(mKgio, "SocketMethods");
+	VALUE mWaiters = rb_define_module_under(mKgio, "DefaultWaiters");
+
+	id_set_backtrace = rb_intern("set_backtrace");
+	eErrno_EPIPE = rb_const_get(rb_mErrno, rb_intern("EPIPE"));
+	eErrno_ECONNRESET = rb_const_get(rb_mErrno, rb_intern("ECONNRESET"));
+
+	/*
+	 * Returns the client IP address of the socket as a string
+	 * (e.g. "127.0.0.1" or "::1").
+	 * This is always the value of the Kgio::LOCALHOST constant
+	 * for UNIX domain sockets.
+	 */
+	rb_define_attr(mSocketMethods, "kgio_addr", 1, 1);
+	rb_include_module(mPipeMethods, mWaiters);
+	rb_include_module(mSocketMethods, mWaiters);
+
 	tfo_maybe();
 	init_kgio_wait();
-	init_kgio_read_write();
+	init_kgio_read();
+	init_kgio_write();
+	init_kgio_writev();
 	init_kgio_connect();
 	init_kgio_accept();
 	init_kgio_autopush();

data/ext/kgio/poll.c

@@ -139,13 +139,13 @@ static VALUE poll_result(int nr, struct poll_args *a)
 static VALUE do_poll(VALUE args)
 {
 	struct poll_args *a = (struct poll_args *)args;
-	int nr;
+	long nr;
 
 	Check_Type(a->ios, T_HASH);
 
 retry:
 	hash2pollfds(a);
-	nr = (int)rb_thread_blocking_region(nogvl_poll, a, RUBY_UBF_IO, NULL);
+	nr = (long)rb_thread_blocking_region(nogvl_poll, a, RUBY_UBF_IO, NULL);
 	if (nr < 0) {
 		if (interrupted()) {
 			if (retryable(a)) {