mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
This backport of r58812 is necessary to ease backporting r59028,
which fixes a real bug. * thread.c (struct waiting_fd): declare (rb_thread_io_blocking_region): use on-stack list waiter (rb_notify_fd_close): walk vm->waiting_fds instead (call_without_gvl): remove old field setting (th_init): ditto [Feature #9632] * vm_core.h (typedef struct rb_vm_struct): add waiting_fds list * (typedef struct rb_thread_struct): remove waiting_fd field (rb_vm_living_threads_init): initialize waiting_fds list This should fix bad interactions with test_race_gets_and_close in test/ruby/test_io.rb since we ensure rb_notify_fd_close continues returning the busy flag after enqueuing the interrupt. * thread.c (rb_notify_fd_close): do not enqueue multiple interrupts [ruby-core:81581] [Bug #13632] * test/ruby/test_io.rb (test_single_exception_on_close): new test based on script from Nikolay git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa
parent
739782e37a
commit
651990fa73
6 changed files with 78 additions and 15 deletions
27
ChangeLog
27
ChangeLog
|
|
@ -1,3 +1,30 @@
|
|||
Fri Jul 7 10:58:10 2017 Eric Wong <e@80x24.org>
|
||||
|
||||
This backport of r58812 is necessary to ease backporting r59028,
|
||||
which fixes a real bug.
|
||||
|
||||
* thread.c (struct waiting_fd): declare
|
||||
(rb_thread_io_blocking_region): use on-stack list waiter
|
||||
(rb_notify_fd_close): walk vm->waiting_fds instead
|
||||
(call_without_gvl): remove old field setting
|
||||
(th_init): ditto
|
||||
[Feature #9632]
|
||||
|
||||
* vm_core.h (typedef struct rb_vm_struct): add waiting_fds list
|
||||
|
||||
* (typedef struct rb_thread_struct): remove waiting_fd field
|
||||
(rb_vm_living_threads_init): initialize waiting_fds list
|
||||
|
||||
This should fix bad interactions with test_race_gets_and_close
|
||||
in test/ruby/test_io.rb since we ensure rb_notify_fd_close
|
||||
continues returning the busy flag after enqueuing the interrupt.
|
||||
|
||||
* thread.c (rb_notify_fd_close): do not enqueue multiple interrupts
|
||||
[ruby-core:81581] [Bug #13632]
|
||||
|
||||
* test/ruby/test_io.rb (test_single_exception_on_close):
|
||||
new test based on script from Nikolay
|
||||
|
||||
Wed Jul 5 15:55:35 2017 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* ext/openssl/ossl_cipher.c: remove the encryption key initialization
|
||||
|
|
|
|||
|
|
@ -2734,6 +2734,28 @@ End
|
|||
end;
|
||||
end
|
||||
|
||||
def test_single_exception_on_close
|
||||
a = []
|
||||
t = []
|
||||
10.times do
|
||||
r, w = IO.pipe
|
||||
a << [r, w]
|
||||
t << Thread.new do
|
||||
while r.gets
|
||||
end rescue IOError
|
||||
Thread.current.pending_interrupt?
|
||||
end
|
||||
end
|
||||
a.each do |r, w|
|
||||
w.write -"\n"
|
||||
w.close
|
||||
r.close
|
||||
end
|
||||
t.each do |th|
|
||||
assert_equal false, th.value, '[ruby-core:81581] [Bug #13632]'
|
||||
end
|
||||
end
|
||||
|
||||
def test_open_mode
|
||||
feature4742 = "[ruby-core:36338]"
|
||||
bug6055 = '[ruby-dev:45268]'
|
||||
|
|
|
|||
33
thread.c
33
thread.c
|
|
@ -96,6 +96,11 @@ static int rb_threadptr_pending_interrupt_empty_p(rb_thread_t *th);
|
|||
static volatile int system_working = 1;
|
||||
|
||||
#define closed_stream_error GET_VM()->special_exceptions[ruby_error_closed_stream]
|
||||
struct waiting_fd {
|
||||
struct list_node wfd_node; /* <=> vm.waiting_fds */
|
||||
rb_thread_t *th;
|
||||
int fd;
|
||||
};
|
||||
|
||||
inline static void
|
||||
st_delete_wrap(st_table *table, st_data_t key)
|
||||
|
|
@ -1288,7 +1293,6 @@ call_without_gvl(void *(*func)(void *), void *data1,
|
|||
rb_thread_t *th = GET_THREAD();
|
||||
int saved_errno = 0;
|
||||
|
||||
th->waiting_fd = -1;
|
||||
if (ubf == RUBY_UBF_IO || ubf == RUBY_UBF_PROCESS) {
|
||||
ubf = ubf_select;
|
||||
data2 = th;
|
||||
|
|
@ -1411,11 +1415,15 @@ VALUE
|
|||
rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd)
|
||||
{
|
||||
volatile VALUE val = Qundef; /* shouldn't be used */
|
||||
rb_vm_t *vm = GET_VM();
|
||||
rb_thread_t *th = GET_THREAD();
|
||||
volatile int saved_errno = 0;
|
||||
int state;
|
||||
struct waiting_fd wfd;
|
||||
|
||||
th->waiting_fd = fd;
|
||||
wfd.fd = fd;
|
||||
wfd.th = th;
|
||||
list_add(&vm->waiting_fds, &wfd.wfd_node);
|
||||
|
||||
TH_PUSH_TAG(th);
|
||||
if ((state = EXEC_TAG()) == 0) {
|
||||
|
|
@ -1426,8 +1434,8 @@ rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd)
|
|||
}
|
||||
TH_POP_TAG();
|
||||
|
||||
/* clear waiting_fd anytime */
|
||||
th->waiting_fd = -1;
|
||||
/* must be deleted before jump */
|
||||
list_del(&wfd.wfd_node);
|
||||
|
||||
if (state) {
|
||||
JUMP_TAG(state);
|
||||
|
|
@ -2172,16 +2180,23 @@ int
|
|||
rb_notify_fd_close(int fd)
|
||||
{
|
||||
rb_vm_t *vm = GET_THREAD()->vm;
|
||||
rb_thread_t *th = 0;
|
||||
struct waiting_fd *wfd = 0;
|
||||
int busy;
|
||||
|
||||
busy = 0;
|
||||
list_for_each(&vm->living_threads, th, vmlt_node) {
|
||||
if (th->waiting_fd == fd) {
|
||||
VALUE err = th->vm->special_exceptions[ruby_error_closed_stream];
|
||||
list_for_each(&vm->waiting_fds, wfd, wfd_node) {
|
||||
if (wfd->fd == fd) {
|
||||
rb_thread_t *th = wfd->th;
|
||||
VALUE err;
|
||||
|
||||
busy = 1;
|
||||
if (!th) {
|
||||
continue;
|
||||
}
|
||||
wfd->th = 0;
|
||||
err = th->vm->special_exceptions[ruby_error_closed_stream];
|
||||
rb_threadptr_pending_interrupt_enque(th, err);
|
||||
rb_threadptr_interrupt(th);
|
||||
busy = 1;
|
||||
}
|
||||
}
|
||||
return busy;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
#define RUBY_VERSION "2.3.5"
|
||||
#define RUBY_RELEASE_DATE "2017-07-05"
|
||||
#define RUBY_PATCHLEVEL 340
|
||||
#define RUBY_RELEASE_DATE "2017-07-07"
|
||||
#define RUBY_PATCHLEVEL 341
|
||||
|
||||
#define RUBY_RELEASE_YEAR 2017
|
||||
#define RUBY_RELEASE_MONTH 7
|
||||
#define RUBY_RELEASE_DAY 5
|
||||
#define RUBY_RELEASE_DAY 7
|
||||
|
||||
#include "ruby/version.h"
|
||||
|
||||
|
|
|
|||
1
vm.c
1
vm.c
|
|
@ -2394,7 +2394,6 @@ th_init(rb_thread_t *th, VALUE self)
|
|||
th->status = THREAD_RUNNABLE;
|
||||
th->errinfo = Qnil;
|
||||
th->last_status = Qnil;
|
||||
th->waiting_fd = -1;
|
||||
th->root_svar = Qfalse;
|
||||
th->local_storage_recursive_hash = Qnil;
|
||||
th->local_storage_recursive_hash_for_trace = Qnil;
|
||||
|
|
|
|||
|
|
@ -486,6 +486,7 @@ typedef struct rb_vm_struct {
|
|||
struct rb_thread_struct *main_thread;
|
||||
struct rb_thread_struct *running_thread;
|
||||
|
||||
struct list_head waiting_fds; /* <=> struct waiting_fd */
|
||||
struct list_head living_threads;
|
||||
size_t living_thread_num;
|
||||
VALUE thgroup_default;
|
||||
|
|
@ -683,8 +684,6 @@ typedef struct rb_thread_struct {
|
|||
/* passing state */
|
||||
int state;
|
||||
|
||||
int waiting_fd;
|
||||
|
||||
/* for rb_iterate */
|
||||
const rb_block_t *passed_block;
|
||||
|
||||
|
|
@ -1043,6 +1042,7 @@ void rb_thread_wakeup_timer_thread(void);
|
|||
static inline void
|
||||
rb_vm_living_threads_init(rb_vm_t *vm)
|
||||
{
|
||||
list_head_init(&vm->waiting_fds);
|
||||
list_head_init(&vm->living_threads);
|
||||
vm->living_thread_num = 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue