use rb_gc_for_fd for more callers

normal · normal · commit 61e5fe06748d · 2015-11-23T22:50:53.000Z
* dir.c (dir_initialize): use rb_gc_for_fd for ENOMEM * ext/socket/init.c (rsock_socket): ditto * ext/socket/socket.c (rsock_socketpair): ditto * internal.h (rb_gc_for_fd): prototype * io.c (rb_gc_for_fd): remove static [ruby-core:71623] [Feature #11727] Manpages for opendir(2), socket(2), and socketpair(3posix) describe ENOMEM as a possible error for each of these; handle it consistently with our existing wrappers for open(2)/pipe(2) etc... git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52726 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Nov 24 07:50:15 2015  Eric Wong  <e@80x24.org>
+
+	* dir.c (dir_initialize): use rb_gc_for_fd for ENOMEM
+	* ext/socket/init.c (rsock_socket): ditto
+	* ext/socket/socket.c (rsock_socketpair): ditto
+	* internal.h (rb_gc_for_fd): prototype
+	* io.c (rb_gc_for_fd): remove static
+	  [ruby-core:71623] [Feature #11727]
+
 Tue Nov 24 06:46:27 2015  Eric Wong  <e@80x24.org>
 
 	* io.c (rb_gc_for_fd): new helper function
diff --git a/dir.c b/dir.c
@@ -519,8 +519,7 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
     path = RSTRING_PTR(dirname);
     dp->dir = opendir(path);
     if (dp->dir == NULL) {
-	if (errno == EMFILE || errno == ENFILE) {
-	    rb_gc();
+	if (rb_gc_for_fd(errno)) {
 	    dp->dir = opendir(path);
 	}
 #ifdef HAVE_GETATTRLIST
diff --git a/ext/socket/init.c b/ext/socket/init.c
@@ -358,8 +358,7 @@ rsock_socket(int domain, int type, int proto)
 
     fd = rsock_socket0(domain, type, proto);
     if (fd < 0) {
-       if (errno == EMFILE || errno == ENFILE) {
-           rb_gc();
+       if (rb_gc_for_fd(errno)) {
            fd = rsock_socket0(domain, type, proto);
        }
     }
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
@@ -241,8 +241,7 @@ rsock_socketpair(int domain, int type, int protocol, int sv[2])
     int ret;
 
     ret = rsock_socketpair0(domain, type, protocol, sv);
-    if (ret < 0 && (errno == EMFILE || errno == ENFILE)) {
-        rb_gc();
+    if (ret < 0 && rb_gc_for_fd(errno)) {
         ret = rsock_socketpair0(domain, type, protocol, sv);
     }
 
diff --git a/internal.h b/internal.h
@@ -851,6 +851,7 @@ void rb_stdio_set_default_encoding(void);
 void rb_write_error_str(VALUE mesg);
 VALUE rb_io_flush_raw(VALUE, int);
 size_t rb_io_memsize(const rb_io_t *);
+int rb_gc_for_fd(int err);
 
 /* load.c */
 VALUE rb_get_load_path(void);
diff --git a/io.c b/io.c
@@ -884,7 +884,7 @@ rb_io_read_check(rb_io_t *fptr)
     return;
 }
 
-static int
+int
 rb_gc_for_fd(int err)
 {
     if (err == EMFILE || err == ENFILE || err == ENOMEM) {

Original file line number	Diff line number	Diff line change
`@@ -358,8 +358,7 @@ rsock_socket(int domain, int type, int proto)`
`358`	`358`
`359`	`359`	`fd = rsock_socket0(domain, type, proto);`
`360`	`360`	`if (fd < 0) {`
`361`		`- if (errno == EMFILE \|\| errno == ENFILE) {`
`362`		`- rb_gc();`
	`361`	`+ if (rb_gc_for_fd(errno)) {`
`363`	`362`	`fd = rsock_socket0(domain, type, proto);`
`364`	`363`	`}`
`365`	`364`	`}`
Original file line number	Diff line number	Diff line change
`@@ -241,8 +241,7 @@ rsock_socketpair(int domain, int type, int protocol, int sv[2])`
`241`	`241`	`int ret;`
`242`	`242`
`243`	`243`	`ret = rsock_socketpair0(domain, type, protocol, sv);`
`244`		`- if (ret < 0 && (errno == EMFILE \|\| errno == ENFILE)) {`
`245`		`- rb_gc();`
	`244`	`+ if (ret < 0 && rb_gc_for_fd(errno)) {`
`246`	`245`	`ret = rsock_socketpair0(domain, type, protocol, sv);`
`247`	`246`	`}`
`248`	`247`
Original file line number	Diff line number	Diff line change
`@@ -884,7 +884,7 @@ rb_io_read_check(rb_io_t *fptr)`
`884`	`884`	`return;`
`885`	`885`	`}`
`886`	`886`
`887`		`-static int`
	`887`	`+int`
`888`	`888`	`rb_gc_for_fd(int err)`
`889`	`889`	`{`
`890`	`890`	`if (err == EMFILE \|\| err == ENFILE \|\| err == ENOMEM) {`