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

* io.c (linux_get_maxfd): new function to find maximum fd on Linux.

Browse Source 
(rb_close_before_exec): use linux_get_maxfd.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33805 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2011-11-21 14:40:09 +00:00
parent 81bedc68ac
commit f49f6ff1d7
2 changed files with 56 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Nov 21 23:39:14 2011 Tanaka Akira <akr@fsij.org>
* io.c (linux_get_maxfd): new function to find maximum fd on Linux.
(rb_close_before_exec): use linux_get_maxfd.
Mon Nov 21 06:16:24 2011 NARUSE, Yui <naruse@ruby-lang.org> Mon Nov 21 06:16:24 2011 NARUSE, Yui <naruse@ruby-lang.org>
* cont.c (fiber_switch): ignore fiber context switch * cont.c (fiber_switch): ignore fiber context switch

56
io.c
View File

@ -5131,20 +5131,66 @@ popen_redirect(struct popen_arg *p)
} }
} }
#if defined(__linux__)
/* Linux /proc/self/status contains a line: "FDSize:\t<nnn>\n"
* Since /proc may not be available, linux_get_maxfd is just a hint.
* This function, linux_get_maxfd, must be async-signal-safe.
* I.e. opendir() is not usable.
*
* Note that memchr() and memcmp is *not* async-signal-safe in POSIX.
* However they are easy to re-implement in async-signal-safe manner.
* (Also note that there is missing/memcmp.c.)
*/
static int
linux_get_maxfd(void)
{
int fd;
char buf[4096], *p, *n, *e;
ssize_t ss;
fd = rb_cloexec_open("/proc/self/status", O_RDONLY|O_NOCTTY, 0);
if (fd == -1) return -1;
ss = read(fd, buf, sizeof(buf));
if (ss == -1) goto err;
p = buf;
e = buf + ss;
while (sizeof("FDSize:\t0\n")-1 <= e-p &&
(n = memchr(p, '\n', e-p)) != NULL) {
if (memcmp(p, "FDSize:", sizeof("FDSize:")-1) == 0) {
int fdsize;
p += sizeof("FDSize:")-1;
*n = '\0';
fdsize = (int)ruby_strtoul(p, (char **)NULL, 10);
close(fd);
return fdsize;
}
p = n+1;
}
/* fall through */
err:
close(fd);
return -1;
}
#endif
void 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 = max_file_descriptor;
if (max < maxhint)
max = maxhint;
#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); ret = fcntl(0, F_MAXFD);
if (ret != -1) { if (ret != -1)
max = ret; maxhint = max = ret;
} #elif defined(__linux__)
ret = linux_get_maxfd();
if (maxhint < ret)
maxhint = ret;
/* maxhint = max = ret; if (ret == -1) abort(); // test */
#endif #endif
if (max < maxhint)
max = maxhint;
for (fd = lowfd; fd <= max; fd++) { for (fd = lowfd; fd <= max; fd++) {
if (!NIL_P(noclose_fds) && if (!NIL_P(noclose_fds) &&
RTEST(rb_hash_lookup(noclose_fds, INT2FIX(fd)))) RTEST(rb_hash_lookup(noclose_fds, INT2FIX(fd))))