diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-18 18:22:44 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-18 18:22:44 +0000 |
| commit | 5b2eef31aa2f783a3f6e4418e4879cd8fb42bcc7 (patch) | |
| tree | f33f27b4db42b53f0604e64ab63195a041f233f7 /ext/socket | |
| parent | 94636e83dc72518ff26d18ce248bd9fa1f87c234 (diff) | |
* 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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/socket.c | 4 |
1 files changed, 4 insertions, 0 deletions
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)) { |