diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-09 19:36:49 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-09 19:36:49 +0000 |
commit | 11fdbaddf29d9566104439e1cf74b5cb053b741d (patch) | |
tree | 51dbe98123780e77c464610664e22b429d403a96 /ext/-test- | |
parent | d679034a865181cd26d16291a94f71914e92e31e (diff) |
merge revision(s) 59030,59031: [Backport #13638]
thread.c: avoid busy looping on rb_thread_fd_close
We no longer use it this function, but extensions do, and
we need to ensure it continues to work for them.
* thread.c (rb_thread_fd_close): schedule other threads in loop
* ext/-test-/thread_fd_close/thread_fd_close.c: new file
* ext/-test-/thread_fd_close/depend: ditto
* ext/-test-/thread_fd_close/extconf.rb: ditto
* test/-ext-/thread_fd_close/test_thread_fd_close.rb: new test
* properties.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59295 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/-test-')
-rw-r--r-- | ext/-test-/thread_fd_close/depend | 16 | ||||
-rw-r--r-- | ext/-test-/thread_fd_close/extconf.rb | 2 | ||||
-rw-r--r-- | ext/-test-/thread_fd_close/thread_fd_close.c | 14 |
3 files changed, 32 insertions, 0 deletions
diff --git a/ext/-test-/thread_fd_close/depend b/ext/-test-/thread_fd_close/depend new file mode 100644 index 0000000000..7bc04c3db3 --- /dev/null +++ b/ext/-test-/thread_fd_close/depend @@ -0,0 +1,16 @@ +# AUTOGENERATED DEPENDENCIES START +thread_fd_close.o: $(RUBY_EXTCONF_H) +thread_fd_close.o: $(arch_hdrdir)/ruby/config.h +thread_fd_close.o: $(hdrdir)/ruby/backward.h +thread_fd_close.o: $(hdrdir)/ruby/defines.h +thread_fd_close.o: $(hdrdir)/ruby/encoding.h +thread_fd_close.o: $(hdrdir)/ruby/intern.h +thread_fd_close.o: $(hdrdir)/ruby/io.h +thread_fd_close.o: $(hdrdir)/ruby/missing.h +thread_fd_close.o: $(hdrdir)/ruby/onigmo.h +thread_fd_close.o: $(hdrdir)/ruby/oniguruma.h +thread_fd_close.o: $(hdrdir)/ruby/ruby.h +thread_fd_close.o: $(hdrdir)/ruby/st.h +thread_fd_close.o: $(hdrdir)/ruby/subst.h +thread_fd_close.o: thread_fd_close.c +# AUTOGENERATED DEPENDENCIES END diff --git a/ext/-test-/thread_fd_close/extconf.rb b/ext/-test-/thread_fd_close/extconf.rb new file mode 100644 index 0000000000..0d9694539c --- /dev/null +++ b/ext/-test-/thread_fd_close/extconf.rb @@ -0,0 +1,2 @@ +# frozen_string_literal: true +create_makefile('-test-/thread_fd_close') diff --git a/ext/-test-/thread_fd_close/thread_fd_close.c b/ext/-test-/thread_fd_close/thread_fd_close.c new file mode 100644 index 0000000000..4fd967c5b3 --- /dev/null +++ b/ext/-test-/thread_fd_close/thread_fd_close.c @@ -0,0 +1,14 @@ +#include "ruby/ruby.h" + +static VALUE +thread_fd_close(VALUE ign, VALUE fd) +{ + rb_thread_fd_close(NUM2INT(fd)); + return Qnil; +} + +void +Init_thread_fd_close(void) +{ + rb_define_singleton_method(rb_cIO, "thread_fd_close", thread_fd_close, 1); +} |