diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | ext/socket/socket.c | 4 | ||||
| -rw-r--r-- | file.c | 6 | ||||
| -rw-r--r-- | io.c | 2 |
4 files changed, 24 insertions, 1 deletions
@@ -1,3 +1,16 @@ +Mon Sep 19 03:17:48 2005 Tanaka Akira <akr@m17n.org> + + * file.c (rb_thread_flock): wrap the flock system call by + TRAP_BEG/TRAP_END to enable signals. [ruby-dev:27122] + + * ext/socket/socket.c (bsock_send): wrap the sendto and send system + call by TRAP_BEG/TRAP_END to enable signals when writing to a socket + which is full. [ruby-dev:27132] + + * io.c (rb_io_syswrite): wrap the write system call by + TRAP_BEG/TRAP_END to enable signals when writing to a pipe which is + full. [ruby-dev:27134] + Mon Sep 19 03:02:08 2005 Tanaka Akira <akr@m17n.org> * io.c (io_fwrite): wrap the write system call by TRAP_BEG/TRAP_END to diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 91aa53c163..09326ce16f 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -499,11 +499,15 @@ bsock_send(argc, argv, sock) rb_thread_fd_writable(fd); retry: if (!NIL_P(to)) { + TRAP_BEG; n = sendto(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags), (struct sockaddr*)RSTRING(to)->ptr, RSTRING(to)->len); + TRAP_END; } else { + TRAP_BEG; n = send(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags)); + TRAP_END; } if (n < 0) { if (rb_io_wait_writable(fd)) { @@ -2915,7 +2915,11 @@ rb_thread_flock(fd, op, fptr) OpenFile *fptr; { if (rb_thread_alone() || (op & LOCK_NB)) { - return flock(fd, op); + int ret; + TRAP_BEG; + ret = flock(fd, op); + TRAP_END; + return ret; } op |= LOCK_NB; while (flock(fd, op) < 0) { @@ -2331,7 +2331,9 @@ rb_io_syswrite(io, str) if (!rb_thread_fd_writable(fileno(f))) { rb_io_check_closed(fptr); } + TRAP_BEG; n = write(fileno(f), RSTRING(str)->ptr, RSTRING(str)->len); + TRAP_END; if (n == -1) rb_sys_fail(fptr->path); |