* io.c: add rb_read_internal() as blocking function.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14007 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 33 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e2bc1bb21..4194ff2a56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Nov 23 17:34:24 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* io.c: add rb_read_internal() as blocking function.
+
 Fri Nov 23 17:33:39 2007  Koichi Sasada  <ko1@atdot.net>
 
 	* vm.c: fix comment.
diff --git a/io.c b/io.c
index 677c3cab1c..1bc8064700 100644
--- a/io.c
+++ b/io.c
@@ -902,6 +902,27 @@ rb_io_rewind(VALUE io)
     return INT2FIX(0);
 }
 
+struct read_struct {
+    int fd;
+    void *buf;
+    size_t capa;
+};
+
+static VALUE
+read_func(void *ptr)
+{
+    struct read_struct *rs = (struct read_struct*)ptr;
+    return read(rs->fd, rs->buf, rs->capa);
+}
+
+
+static int
+rb_read_internal(int fd, void *buf, size_t count)
+{
+    struct read_struct rs = {fd, buf, count};
+    return rb_thread_blocking_region(read_func, &rs, RB_UBF_DFL, 0);
+}
+
 static int
 io_fillbuf(rb_io_t *fptr)
 {
@@ -915,9 +936,9 @@ io_fillbuf(rb_io_t *fptr)
     }
     if (fptr->rbuf_len == 0) {
       retry:
-        TRAP_BEG;
-        r = read(fptr->fd, fptr->rbuf, fptr->rbuf_capa);
-        TRAP_END; /* xxx: signal handler may modify rbuf */
+	{
+	    r = rb_read_internal(fptr->fd, fptr->rbuf, fptr->rbuf_capa);
+	}
         if (r < 0) {
             if (rb_io_wait_readable(fptr->fd))
                 goto retry;
@@ -1329,13 +1350,11 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
 	if (RSTRING_LEN(str) != len) goto modified;
         if (nonblock) {
             rb_io_set_nonblock(fptr);
-            n = read(fptr->fd, RSTRING_PTR(str), len);
+	    n = rb_read_internal(fptr->fd, RSTRING_PTR(str), len);
         }
         else {
-            TRAP_BEG;
-            n = read(fptr->fd, RSTRING_PTR(str), len);
-            TRAP_END;
-        }
+            n = rb_read_internal(fptr->fd, RSTRING_PTR(str), len);
+	}
         if (n < 0) {
             if (!nonblock && rb_io_wait_readable(fptr->fd))
                 goto again;
@@ -2791,9 +2810,8 @@ rb_io_sysread(int argc, VALUE *argv, VALUE io)
     if (RSTRING_LEN(str) != ilen) {
 	rb_raise(rb_eRuntimeError, "buffer string modified");
     }
-    TRAP_BEG;
-    n = read(fptr->fd, RSTRING_PTR(str), ilen);
-    TRAP_END;
+
+    n = rb_read_internal(fptr->fd, RSTRING_PTR(str), ilen);
 
     if (n == -1) {
 	rb_sys_fail(fptr->path);