From b41ccc4a9c4d4900e79642bb98ad87b2ba63e766 Mon Sep 17 00:00:00 2001 From: akr Date: Wed, 20 Jul 2011 13:26:10 +0000 Subject: * include/ruby/intern.h (rb_update_max_fd): declaration moved from internal.h. * file.c: ditto. * io.c: call rb_update_max_fd for each new fds. * process.c: ditto. * random.c: ditto. * ruby.c: ditto. * ext/io/console/console.c: ditto. * ext/openssl/ossl_bio.c: ditto. * ext/pty/pty.c: ditto. * ext/socket/init.c: ditto. * ext/socket/socket.c: ditto. * ext/socket/ancdata.c: ditto. * ext/socket/unixsocket.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/io/console/console.c | 2 ++ ext/openssl/ossl_bio.c | 1 + ext/pty/pty.c | 14 ++++++++++++++ ext/socket/ancdata.c | 2 ++ ext/socket/init.c | 5 +++++ ext/socket/socket.c | 2 ++ ext/socket/unixsocket.c | 1 + 7 files changed, 27 insertions(+) (limited to 'ext') diff --git a/ext/io/console/console.c b/ext/io/console/console.c index f83f81a917..87101fea5e 100644 --- a/ext/io/console/console.c +++ b/ext/io/console/console.c @@ -562,6 +562,7 @@ console_dev(VALUE klass) #ifdef CONSOLE_DEVICE_FOR_WRITING fd = open(CONSOLE_DEVICE_FOR_WRITING, O_WRONLY); if (fd < 0) return Qnil; + rb_update_max_fd(fd); args[1] = INT2FIX(O_WRONLY); args[0] = INT2NUM(fd); out = rb_class_new_instance(2, args, klass); @@ -573,6 +574,7 @@ console_dev(VALUE klass) #endif return Qnil; } + rb_update_max_fd(fd); args[1] = INT2FIX(O_RDWR); args[0] = INT2NUM(fd); con = rb_class_new_instance(2, args, klass); diff --git a/ext/openssl/ossl_bio.c b/ext/openssl/ossl_bio.c index be16379311..ed7c0a71a5 100644 --- a/ext/openssl/ossl_bio.c +++ b/ext/openssl/ossl_bio.c @@ -28,6 +28,7 @@ ossl_obj2bio(VALUE obj) if ((fd = dup(FPTR_TO_FD(fptr))) < 0){ rb_sys_fail(0); } + rb_update_max_fd(fd); if (!(fp = fdopen(fd, "r"))){ close(fd); rb_sys_fail(0); diff --git a/ext/pty/pty.c b/ext/pty/pty.c index 1461d28262..3797972975 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -177,6 +177,7 @@ chfunc(void *data, char *errbuf, size_t errbuf_len) { int i = open("/dev/tty", O_RDONLY); if (i < 0) ERROR_EXIT("/dev/tty"); + rb_update_max_fd(i); if (ioctl(i, TIOCNOTTY, (char *)0)) ERROR_EXIT("ioctl(TIOCNOTTY)"); close(i); @@ -198,6 +199,7 @@ chfunc(void *data, char *errbuf, size_t errbuf_len) if (slave < 0) { ERROR_EXIT("open: pty slave"); } + rb_update_max_fd(slave); close(master); #endif dup2(slave,0); @@ -289,6 +291,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, sigemptyset(&dfl.sa_mask); if ((masterfd = posix_openpt(O_RDWR|O_NOCTTY)) == -1) goto error; + rb_update_max_fd(masterfd); if (sigaction(SIGCHLD, &dfl, &old) == -1) goto error; if (grantpt(masterfd) == -1) goto grantpt_error; if (sigaction(SIGCHLD, &old, NULL) == -1) goto error; @@ -296,6 +299,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, if ((slavedevice = ptsname(masterfd)) == NULL) goto error; if (no_mesg(slavedevice, nomesg) == -1) goto error; if ((slavefd = open(slavedevice, O_RDWR|O_NOCTTY, 0)) == -1) goto error; + rb_update_max_fd(slavefd); #if defined I_PUSH && !defined linux if (ioctl(slavefd, I_PUSH, "ptem") == -1) goto error; @@ -327,6 +331,8 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, if (!fail) return -1; rb_raise(rb_eRuntimeError, "openpty() failed"); } + rb_update_max_fd(*master); + rb_update_max_fd(*slave); if (no_mesg(SlaveName, nomesg) == -1) { if (!fail) return -1; rb_raise(rb_eRuntimeError, "can't chmod slave pty"); @@ -342,8 +348,11 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, if (!fail) return -1; rb_raise(rb_eRuntimeError, "_getpty() failed"); } + rb_update_max_fd(*master); *slave = open(name, O_RDWR); + /* error check? */ + rb_update_max_fd(*slave); strlcpy(SlaveName, name, DEVICELEN); return 0; @@ -357,6 +366,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, extern int grantpt(int); if((masterfd = open("/dev/ptmx", O_RDWR, 0)) == -1) goto error; + rb_update_max_fd(masterfd); s = signal(SIGCHLD, SIG_DFL); if(grantpt(masterfd) == -1) goto error; signal(SIGCHLD, s); @@ -364,6 +374,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, if((slavedevice = ptsname(masterfd)) == NULL) goto error; if (no_mesg(slavedevice, nomesg) == -1) goto error; if((slavefd = open(slavedevice, O_RDWR, 0)) == -1) goto error; + rb_update_max_fd(slavefd); #if defined I_PUSH && !defined linux if(ioctl(slavefd, I_PUSH, "ptem") == -1) goto error; if(ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error; @@ -387,9 +398,11 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, for (p = deviceNo; *p != NULL; p++) { snprintf(MasterName, sizeof MasterName, MasterDevice, *p); if ((masterfd = open(MasterName,O_RDWR,0)) >= 0) { + rb_update_max_fd(masterfd); *master = masterfd; snprintf(SlaveName, DEVICELEN, SlaveDevice, *p); if ((slavefd = open(SlaveName,O_RDWR,0)) >= 0) { + rb_update_max_fd(slavefd); *slave = slavefd; if (chown(SlaveName, getuid(), getgid()) != 0) goto error; if (chmod(SlaveName, nomesg ? 0600 : 0622) != 0) goto error; @@ -577,6 +590,7 @@ pty_getpty(int argc, VALUE *argv, VALUE self) wfptr->fd = dup(info.fd); if (wfptr->fd == -1) rb_sys_fail("dup()"); + rb_update_max_fd(wfptr->fd); wfptr->pathv = rfptr->pathv; res = rb_ary_new2(3); diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 81394371ff..89a8921414 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -1384,6 +1384,7 @@ discard_cmsg(struct cmsghdr *cmh, char *msg_end) int *end = (int *)((char *)cmh + cmh->cmsg_len); while ((char *)fdp + sizeof(int) <= (char *)end && (char *)fdp + sizeof(int) <= msg_end) { + rb_update_max_fd(*fdp); close(*fdp); fdp++; } @@ -1426,6 +1427,7 @@ make_io_for_unix_rights(VALUE ctl, struct cmsghdr *cmh, char *msg_end) VALUE io; if (fstat(fd, &stbuf) == -1) rb_raise(rb_eSocket, "invalid fd in SCM_RIGHTS"); + rb_update_max_fd(fd); if (S_ISSOCK(stbuf.st_mode)) io = rsock_init_sock(rb_obj_alloc(rb_cSocket), fd); else diff --git a/ext/socket/init.c b/ext/socket/init.c index e55736cabe..8df1aee9bf 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -48,6 +48,7 @@ rsock_init_sock(VALUE sock, int fd) if (fstat(fd, &sbuf) < 0) rb_sys_fail(0); + rb_update_max_fd(fd); if (!S_ISSOCK(sbuf.st_mode)) rb_raise(rb_eArgError, "not a socket file descriptor"); #else @@ -250,6 +251,8 @@ rsock_socket(int domain, int type, int proto) fd = socket(domain, type, proto); } } + if (0 <= fd) + rb_update_max_fd(fd); return fd; } @@ -463,6 +466,7 @@ rsock_s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, s } rb_sys_fail("accept(2)"); } + rb_update_max_fd(fd2); make_fd_nonblock(fd2); return rsock_init_sock(rb_obj_alloc(klass), fd2); } @@ -509,6 +513,7 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len) } rb_sys_fail(0); } + rb_update_max_fd(fd2); if (!klass) return INT2NUM(fd2); return rsock_init_sock(rb_obj_alloc(klass), fd2); } diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 63586fc002..c2743cd621 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -119,6 +119,8 @@ rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass) if (ret < 0) { rb_sys_fail("socketpair(2)"); } + rb_update_max_fd(sp[0]); + rb_update_max_fd(sp[1]); s1 = rsock_init_sock(rb_obj_alloc(klass), sp[0]); s2 = rsock_init_sock(rb_obj_alloc(klass), sp[1]); diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c index 88ffa60fb6..587caf88a0 100644 --- a/ext/socket/unixsocket.c +++ b/ext/socket/unixsocket.c @@ -383,6 +383,7 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock) #if FD_PASSING_BY_MSG_CONTROL memcpy(&fd, CMSG_DATA(&cmsg.hdr), sizeof(int)); #endif + rb_update_max_fd(fd); if (klass == Qnil) return INT2FIX(fd); -- cgit v1.2.3