summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ruby.c20
2 files changed, 5 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 9385aa9..46ab1fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Oct 18 09:20:17 2015 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * ruby.c (open_load_file): use rb_thread_wait_fd() instead of reopen.
+
Sun Oct 18 05:11:22 2015 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* ruby.c (open_load_file): reset O_NONBLOCK after open.
diff --git a/ruby.c b/ruby.c
index 8457bea1..5b92d49 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1726,19 +1726,6 @@ load_file_internal(VALUE argp_v)
return (VALUE)tree;
}
-#ifdef S_ISFIFO
-static void *
-loadopen_func(void *arg)
-{
- int fd;
- fd = rb_cloexec_open((const char *)arg, O_RDONLY, 0);
- if (fd >= 0)
- rb_update_max_fd(fd);
-
- return (void *)(VALUE)fd;
-}
-#endif
-
static VALUE
open_load_file(VALUE fname_v, int *xflag)
{
@@ -1793,12 +1780,7 @@ open_load_file(VALUE fname_v, int *xflag)
rb_load_fail(fname_v, strerror(e));
}
if (S_ISFIFO(st.st_mode)) {
- /* We need to wait if FIFO is empty. So, let's reopen it. */
- (void)close(fd);
- fd = (int)(VALUE)rb_thread_call_without_gvl(loadopen_func,
- (void *)fname, RUBY_UBF_IO, 0);
- if (fd < 0)
- rb_load_fail(fname_v, strerror(errno));
+ rb_thread_wait_fd(fd);
}
}
#endif