diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-09-01 09:17:28 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-09-01 09:17:28 +0000 |
commit | 101742348f2dc27b80659c1183f0adb83990c61d (patch) | |
tree | 53fb2ea61462510793ccbed088b7f492f425e78b /thread_sync.c | |
parent | b10ed52acf7fb2b496123775649328f727c18b5c (diff) | |
download | ruby-101742348f2dc27b80659c1183f0adb83990c61d.tar.gz |
* thread_sync.c (queue_do_close): ignore multiple close to allow
multiple producers.
https://bugs.ruby-lang.org/issues/10600#note-14
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51732 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_sync.c')
-rw-r--r-- | thread_sync.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/thread_sync.c b/thread_sync.c index c99f54cb82..21b71702b4 100644 --- a/thread_sync.c +++ b/thread_sync.c @@ -619,23 +619,23 @@ queue_do_close(VALUE self, int argc, VALUE *argv, int is_szq) { VALUE exception = Qfalse; - if (queue_closed_p(self)) raise_closed_queue_error(self); + if (!queue_closed_p(self)) { + rb_scan_args(argc, argv, "01", &exception); + FL_SET(self, QUEUE_CLOSED); - rb_scan_args(argc, argv, "01", &exception); - FL_SET(self, QUEUE_CLOSED); - - if (RTEST(exception)) { - FL_SET(self, QUEUE_CLOSE_EXCEPTION); - } + if (RTEST(exception)) { + FL_SET(self, QUEUE_CLOSE_EXCEPTION); + } - if (queue_num_waiting(self) > 0) { - VALUE waiters = GET_QUEUE_WAITERS(self); - wakeup_all_threads(waiters); - } + if (queue_num_waiting(self) > 0) { + VALUE waiters = GET_QUEUE_WAITERS(self); + wakeup_all_threads(waiters); + } - if (is_szq && szqueue_num_waiting_producer(self) > 0) { - VALUE waiters = GET_SZQUEUE_WAITERS(self); - wakeup_all_threads(waiters); + if (is_szq && szqueue_num_waiting_producer(self) > 0) { + VALUE waiters = GET_SZQUEUE_WAITERS(self); + wakeup_all_threads(waiters); + } } return self; @@ -705,6 +705,8 @@ queue_do_push(VALUE self, VALUE obj) * * - +closed?+ will return true * + * - +close+ will be ignored. + * * - calling enq/push/<< will raise ClosedQueueError('queue closed') * * - when +empty?+ is false, calling deq/pop/shift will return an object |