kgio 2.3.2 → 2.3.3

data/GIT-VERSION-GEN

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

data/ext/kgio/accept.c

@@ -69,6 +69,7 @@ static VALUE xaccept(void *ptr)
 
 #ifdef HAVE_RB_THREAD_BLOCKING_REGION
 #  include <time.h>
+#  include "blocking_io_region.h"
 /*
  * Try to use a (real) blocking accept() since that can prevent
  * thundering herds under Linux:
@@ -82,7 +83,7 @@ static int thread_accept(struct accept_args *a, int force_nonblock)
 {
 	if (force_nonblock)
 		set_nonblocking(a->fd);
-	return (int)rb_thread_blocking_region(xaccept, a, RUBY_UBF_IO, 0);
+	return (int)rb_thread_io_blocking_region(xaccept, a, a->fd);
 }
 
 static void set_blocking_or_block(int fd)

data/ext/kgio/blocking_io_region.h

@@ -0,0 +1,6 @@
+#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+#  ifndef HAVE_RB_THREAD_IO_BLOCKING_REGION
+#    define rb_thread_io_blocking_region(fn,data,fd) \
+            rb_thread_blocking_region((fn),(data),RUBY_UBF_IO,0)
+#  endif
+#endif

data/ext/kgio/connect.c

@@ -98,7 +98,8 @@ static VALUE tcp_connect(VALUE klass, VALUE ip, VALUE port, int io_wait)
  * Creates a new Kgio::TCPSocket object and initiates a
  * non-blocking connection.
  *
- * This may block and call any method defined to kgio_wait_writable.
+ * This may block and call any method defined to +kgio_wait_writable+
+ * for the class.
  *
  * Unlike the TCPSocket.new in Ruby, this does NOT perform DNS
  * lookups (which is subject to a different set of timeouts and
@@ -155,7 +156,8 @@ static VALUE unix_connect(VALUE klass, VALUE path, int io_wait)
  * Creates a new Kgio::UNIXSocket object and initiates a
  * non-blocking connection.
  *
- * This may block and call any method defined to kgio_wait_writable.
+ * This may block and call any method defined to +kgio_wait_writable+
+ * for the class.
  */
 static VALUE kgio_unix_connect(VALUE klass, VALUE path)
 {
@@ -212,7 +214,8 @@ static VALUE stream_connect(VALUE klass, VALUE addr, int io_wait)
  * Creates a generic Kgio::Socket object and initiates a
  * non-blocking connection.
  *
- * This may block and call any method assigned to kgio_wait_writable.
+ * This may block and call any method defined to +kgio_wait_writable+
+ * for the class.
  */
 static VALUE kgio_connect(VALUE klass, VALUE addr)
 {

data/ext/kgio/extconf.rb

@@ -27,6 +27,7 @@ have_type("struct RObject") and check_sizeof("struct RObject")
 check_sizeof("int")
 have_func('rb_io_ascii8bit_binmode')
 have_func('rb_thread_blocking_region')
+have_func('rb_thread_io_blocking_region')
 have_func('rb_str_set_len')
 
 dir_config('kgio')

data/ext/kgio/poll.c

@@ -62,7 +62,7 @@ static int io_to_pollfd_i(VALUE key, VALUE value, VALUE args)
 
 static void hash2pollfds(struct poll_args *a)
 {
-	a->fds = xmalloc(sizeof(struct poll_args) * RHASH_SIZE(a->ios));
+	a->fds = xmalloc(sizeof(struct pollfd) * RHASH_SIZE(a->ios));
 	a->fd_to_io = st_init_numtable();
 	rb_hash_foreach(a->ios, io_to_pollfd_i, (VALUE)a);
 }

data/ext/kgio/read_write.c

@@ -126,7 +126,7 @@ retry:
  * Reads at most maxlen bytes from the stream socket.  Returns with a
  * newly allocated buffer, or may reuse an existing buffer if supplied.
  *
- * Calls whatever is is defined to be the kgio_wait_readable method
+ * This may block and call any method defined to +kgio_wait_readable+
  * for the class.
  *
  * Returns nil on EOF.
@@ -359,7 +359,7 @@ retry:
  *
  * Returns nil when the write completes.
  *
- * Calls whatever is is defined to be the kgio_wait_writable method
+ * This may block and call any method defined to +kgio_wait_writable+
  * for the class.
  */
 static VALUE kgio_write(VALUE io, VALUE str)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kgio
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 2
   - 3
-  - 2
-  version: 2.3.2
+  - 3
+  version: 2.3.3
 platform: ruby
 authors: 
 - kgio hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 +00:00
+date: 2011-03-15 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,6 +96,7 @@ files:
 - ext/kgio/accept.c
 - ext/kgio/ancient_ruby.h
 - ext/kgio/autopush.c
+- ext/kgio/blocking_io_region.h
 - ext/kgio/connect.c
 - ext/kgio/extconf.rb
 - ext/kgio/kgio.h
@@ -168,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: kinder, gentler I/O for Ruby