diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-18 18:29:19 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-18 18:29:19 +0000 |
| commit | 1ad103b7f83ccd0229ed3f61ef2de8c832cb329b (patch) | |
| tree | 7a8c980e56d242a2bf535d052e4a6e7a5129d7af /ext/socket/socket.c | |
| parent | 9af6e57230e0c47b91b249e1892f444d0f9cea2b (diff) | |
| download | ruby-1ad103b7f83ccd0229ed3f61ef2de8c832cb329b.tar.gz | |
* 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 run signal hander in syswrite method.
[ruby-dev:27134]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/socket.c')
| -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 ca805e5ec3..6a787629f8 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -494,11 +494,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)) { |