diff options
Diffstat (limited to 'io.c')
| -rw-r--r-- | io.c | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -19,6 +19,7 @@ #include "id.h" #include <ctype.h> #include <errno.h> +#include "ruby_atomic.h" #define free(x) xfree(x) @@ -158,15 +159,20 @@ struct argf { int8_t init_p, next_p, binmode; }; -static int max_file_descriptor = NOFILE; +static rb_atomic_t max_file_descriptor = NOFILE; void rb_update_max_fd(int fd) { struct stat buf; + rb_atomic_t afd = (rb_atomic_t)fd; + if (fstat(fd, &buf) != 0 && errno == EBADF) { rb_bug("rb_update_max_fd: invalid fd (%d) given.", fd); } - if (max_file_descriptor < fd) max_file_descriptor = fd; + + while (max_file_descriptor < afd) { + ATOMIC_CAS(max_file_descriptor, max_file_descriptor, afd); + } } void @@ -196,7 +202,7 @@ void rb_fd_fix_cloexec(int fd) { rb_maygvl_fd_fix_cloexec(fd); - if (max_file_descriptor < fd) max_file_descriptor = fd; + rb_update_max_fd(fd); } int @@ -5607,7 +5613,7 @@ void rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds) { int fd, ret; - int max = max_file_descriptor; + int max = (int)max_file_descriptor; #ifdef F_MAXFD /* F_MAXFD is available since NetBSD 2.0. */ ret = fcntl(0, F_MAXFD); /* async-signal-safe */ |