1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

io.c: max_file_descriptor

Browse Source 
* io.c (max_file_descriptor): rb_atomic_t for ATOMIC_CAS().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39776 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-03-16 07:28:20 +00:00
parent 92b367e069
commit af24f5ff6a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
io.c
View File

@ -159,18 +159,19 @@ struct argf {
int8_t init_p, next_p, binmode; int8_t init_p, next_p, binmode;
}; };
static int max_file_descriptor = NOFILE; static rb_atomic_t max_file_descriptor = NOFILE;
void void
rb_update_max_fd(int fd) rb_update_max_fd(int fd)
{ {
struct stat buf; struct stat buf;
rb_atomic_t afd = (rb_atomic_t)fd;
if (fstat(fd, &buf) != 0 && errno == EBADF) { if (fstat(fd, &buf) != 0 && errno == EBADF) {
rb_bug("rb_update_max_fd: invalid fd (%d) given.", fd); rb_bug("rb_update_max_fd: invalid fd (%d) given.", fd);
} }
while (max_file_descriptor < fd) { while (max_file_descriptor < afd) {
ATOMIC_CAS(max_file_descriptor, max_file_descriptor, fd); ATOMIC_CAS(max_file_descriptor, max_file_descriptor, afd);
} }
} }
@ -200,8 +201,9 @@ rb_maygvl_fd_fix_cloexec(int fd)
void void
rb_fd_fix_cloexec(int fd) rb_fd_fix_cloexec(int fd)
{ {
rb_atomic_t afd = (rb_atomic_t)fd;
rb_maygvl_fd_fix_cloexec(fd); rb_maygvl_fd_fix_cloexec(fd);
if (max_file_descriptor < fd) max_file_descriptor = fd; if (max_file_descriptor < afd) max_file_descriptor = afd;
} }
int int
@ -5605,7 +5607,7 @@ void
rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds) rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds)
{ {
int fd, ret; int fd, ret;
int max = max_file_descriptor; int max = (int)max_file_descriptor;
#ifdef F_MAXFD #ifdef F_MAXFD
/* F_MAXFD is available since NetBSD 2.0. */ /* F_MAXFD is available since NetBSD 2.0. */
ret = fcntl(0, F_MAXFD); /* async-signal-safe */ ret = fcntl(0, F_MAXFD); /* async-signal-safe */