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

ruby.c: reduce fstat

Browse source 
* file.c (ruby_is_fd_loadable): now return -1 if loadable but
  may block.
* ruby.c (open_load_file): wait to read by the result of
  ruby_is_fd_loadable, without fstat.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-03-14 07:03:01 +00:00
parent fcadcd3e68
commit a4e6f7d707
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Mon Mar 14 16:02:59 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (ruby_is_fd_loadable): now return -1 if loadable but
may block.
* ruby.c (open_load_file): wait to read by the result of
ruby_is_fd_loadable, without fstat.
Mon Mar 14 13:38:38 2016 NARUSE, Yui <naruse@ruby-lang.org> Mon Mar 14 13:38:38 2016 NARUSE, Yui <naruse@ruby-lang.org>
* numeric.c (fix2str): improve r54092 like rb_int2big(). * numeric.c (fix2str): improve r54092 like rb_int2big().

3
file.c
View file

@ -5644,11 +5644,12 @@ ruby_is_fd_loadable(int fd)
if (fstat(fd, &st) < 0) if (fstat(fd, &st) < 0)
return 0; return 0;
if (S_ISREG(st.st_mode)) if (S_ISREG(st.st_mode))
return 1; return 1;
if (S_ISFIFO(st.st_mode)) if (S_ISFIFO(st.st_mode))
return 1; return -1;
if (S_ISDIR(st.st_mode)) if (S_ISDIR(st.st_mode))
errno = EISDIR; errno = EISDIR;

15
ruby.c
View file

@ -1871,15 +1871,14 @@ open_load_file(VALUE fname_v, int *xflag)
} }
#endif #endif
#ifdef S_ISFIFO e = ruby_is_fd_loadable(fd);
{ if (e <= 0) {
struct stat st; if (!e) {
if (fstat(fd, &st) != 0) {
e = errno; e = errno;
(void)close(fd); (void)close(fd);
rb_load_fail(fname_v, strerror(e)); rb_load_fail(fname_v, strerror(e));
} }
if (S_ISFIFO(st.st_mode)) { else {
/* /*
We need to wait if FIFO is empty. It's FIFO's semantics. We need to wait if FIFO is empty. It's FIFO's semantics.
rb_thread_wait_fd() release GVL. So, it's safe. rb_thread_wait_fd() release GVL. So, it's safe.
@ -1887,12 +1886,6 @@ open_load_file(VALUE fname_v, int *xflag)
rb_thread_wait_fd(fd); rb_thread_wait_fd(fd);
} }
} }
#endif
if (!ruby_is_fd_loadable(fd)) {
e = errno;
(void)close(fd);
rb_load_fail(fname_v, strerror(e));
}
f = rb_io_fdopen(fd, mode, fname); f = rb_io_fdopen(fd, mode, fname);
} }