From d6ed4cad020162cc1acaefc1aab9ed520fa6eea8 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 14 Mar 2016 07:03:01 +0000 Subject: 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 --- ruby.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'ruby.c') diff --git a/ruby.c b/ruby.c index e8633275dc..f96202e217 100644 --- a/ruby.c +++ b/ruby.c @@ -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); } -- cgit v1.2.3