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: make IO#reopen("pathname") atomic

Browse source 
* io.c (rb_io_reopen): create a new, temporary FD via rb_sysopen and
  call rb_cloexec_dup2 on it to atomically replace the file fptr->fd
  points to.  This leaves no possible window where fptr->fd is invalid
  to userspace (even for any threads running w/o GVL).  based on the
  patch by Eric Wong <normalperson@yhbt.net> at [ruby-core:57943].
  [Bug #9036]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-10-20 06:41:24 +00:00
parent c6b9f2913a
commit de004e3a5c
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Sun Oct 20 15:41:22 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_reopen): create a new, temporary FD via rb_sysopen and
call rb_cloexec_dup2 on it to atomically replace the file fptr->fd
points to. This leaves no possible window where fptr->fd is invalid
to userspace (even for any threads running w/o GVL). based on the
patch by Eric Wong <normalperson@yhbt.net> at [ruby-core:57943].
[Bug #9036]
Sun Oct 20 15:29:05 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Oct 20 15:29:05 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* error.c (rb_syserr_fail_path_in): new function split from * error.c (rb_syserr_fail_path_in): new function split from

12
io.c
View file

@ -6665,10 +6665,14 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
} }
} }
else { else {
if (close(fptr->fd) < 0) int tmpfd = rb_sysopen(fptr->pathv, oflags, 0666);
rb_sys_fail_path(fptr->pathv); int err = 0;
fptr->fd = -1; if (rb_cloexec_dup2(tmpfd, fptr->fd) < 0)
fptr->fd = rb_sysopen(fptr->pathv, oflags, 0666); err = errno;
(void)close(tmpfd);
if (err) {
rb_syserr_fail_path(err, fptr->pathv);
}
} }
return file; return file;