kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* io.c: write() should be in blocking region.

Browse source 
* bootstraptest/test_io.rb, test_knownbug.rb: move a fixed test.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14428 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2007-12-21 09:43:49 +00:00
parent 052d5bcee4
commit 91c6c2c170
4 changed files with 69 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Dec 21 18:40:54 2007 Koichi Sasada <ko1@atdot.net>
* io.c: write() should be in blocking region.
* bootstraptest/test_io.rb, test_knownbug.rb: move a fixed test.
Fri Dec 21 17:56:30 2007 <nagai@orca16.orcabay.ddo.jp>
* ext/tk/tcltklib.c: provisional support on Ruby-VM.

16
bootstraptest/test_io.rb
View file

@ -7,3 +7,19 @@ assert_finish 5, %q{
sleep 0.1
w.write "a"
}, '[ruby-dev:31866]'
assert_finish 10, %q{
require "io/nonblock"
r, w = IO.pipe
w.nonblock = true
w.write_nonblock("a" * 100000)
w.nonblock = false
t1 = Thread.new { w.write("b" * 4096) }
t2 = Thread.new { w.write("c" * 4096) }
sleep 0.5
r.sysread(4096).length
sleep 0.5
r.sysread(4096).length
t1.join
t2.join
}, '[ruby-dev:32566]'

15
bootstraptest/test_knownbug.rb
View file

@ -3,18 +3,3 @@
# So all tests will cause failure.
#
assert_finish 2, %q{
require "io/nonblock"
r, w = IO.pipe
w.nonblock = true
w.write_nonblock("a" * 100000)
w.nonblock = false
t1 = Thread.new { w.write("b" * 4096) }
t2 = Thread.new { w.write("c" * 4096) }
sleep 0.5
r.sysread(4096).length
sleep 0.5
r.sysread(4096).length
t1.join
t2.join
}, '[ruby-dev:32566]'

77
io.c
View file

@ -455,6 +455,49 @@ wsplit_p(rb_io_t *fptr)
return fptr->mode & FMODE_WSPLIT;
}
struct io_internal_struct {
int fd;
void *buf;
size_t capa;
int is_read;
};
static VALUE
internal_io_func(void *ptr)
{
struct io_internal_struct *iis = (struct io_internal_struct*)ptr;
if (iis->is_read) {
return read(iis->fd, iis->buf, iis->capa);
}
else {
return write(iis->fd, iis->buf, iis->capa);
}
}
static int
rb_read_internal(int fd, void *buf, size_t count)
{
struct io_internal_struct iis;
iis.fd = fd;
iis.buf = buf;
iis.capa = count;
iis.is_read = 1;
return rb_thread_blocking_region(internal_io_func, &iis, RB_UBF_DFL, 0);
}
static int
rb_write_internal(int fd, void *buf, size_t count)
{
struct io_internal_struct iis;
iis.fd = fd;
iis.buf = buf;
iis.capa = count;
iis.is_read = 0;
return rb_thread_blocking_region(internal_io_func, &iis, RB_UBF_DFL, 0);
}
static int
io_fflush(rb_io_t *fptr)
{
@ -479,9 +522,8 @@ io_fflush(rb_io_t *fptr)
wsplit_p(fptr)) {
l = PIPE_BUF;
}
TRAP_BEG;
r = write(fptr->fd, fptr->wbuf+fptr->wbuf_off, l);
TRAP_END; /* xxx: signal handler may modify wbuf */
r = rb_write_internal(fptr->fd, fptr->wbuf+fptr->wbuf_off, l);
/* xxx: signal handler may modify wbuf */
if (r == fptr->wbuf_len) {
fptr->wbuf_off = 0;
fptr->wbuf_len = 0;
@ -627,9 +669,8 @@ io_fwrite(VALUE str, rb_io_t *fptr)
wsplit_p(fptr)) {
l = PIPE_BUF;
}
TRAP_BEG;
r = write(fptr->fd, RSTRING_PTR(str)+offset, l);
TRAP_END; /* xxx: signal handler may modify given string. */
r = rb_write_internal(fptr->fd, RSTRING_PTR(str)+offset, l);
/* xxx: signal handler may modify given string. */
if (r == n) return len;
if (0 <= r) {
offset += r;
@ -905,30 +946,6 @@ 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;
rs.fd = fd;
rs.buf = buf;
rs.capa = count;
return rb_thread_blocking_region(read_func, &rs, RB_UBF_DFL, 0);
}
static int
io_fillbuf(rb_io_t *fptr)
{