diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-14 07:03:01 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-14 07:03:01 +0000 |
commit | a4e6f7d707293a71727ad18e75aae9639ba423f3 (patch) | |
tree | 490c0990e164882da43fdb2c52461723d7ca47c6 /ruby.c | |
parent | fcadcd3e68982ee727c0cc59bedadfc16b9ca214 (diff) | |
download | ruby-a4e6f7d707293a71727ad18e75aae9639ba423f3.tar.gz |
ruby.c: reduce fstat
* 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
Diffstat (limited to 'ruby.c')
-rw-r--r-- | ruby.c | 15 |
1 files changed, 4 insertions, 11 deletions
@@ -1871,15 +1871,14 @@ open_load_file(VALUE fname_v, int *xflag) } #endif -#ifdef S_ISFIFO - { - struct stat st; - if (fstat(fd, &st) != 0) { + e = ruby_is_fd_loadable(fd); + if (e <= 0) { + if (!e) { e = errno; (void)close(fd); 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. 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); } } -#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); } |