diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-22 04:21:39 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-22 04:21:39 +0000 |
| commit | a98f024d5c977ff3de28ed67062c73c4ec57d841 (patch) | |
| tree | 489c9d91d61635c5f1067e771df242118309f174 /ext | |
| parent | 1976e3ffd9f898f52d39e514f733979ceb4c45f1 (diff) | |
merge revision(s) 44595: [Backport #9342]
* ext/thread/thread.c (rb_szqueue_clear): notify SZQUEUE_WAITERS
on SizedQueue#clear. [ruby-core:59462] [Bug #9342]
* test/thread/test_queue.rb: add test. the patch is from
Justin Collins.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/thread/thread.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/ext/thread/thread.c b/ext/thread/thread.c index a8f675c55b..c409b36da2 100644 --- a/ext/thread/thread.c +++ b/ext/thread/thread.c @@ -503,6 +503,20 @@ rb_szqueue_pop(int argc, VALUE *argv, VALUE self) } /* + * Document-method: Queue#clear + * + * Removes all objects from the queue. + */ + +static VALUE +rb_szqueue_clear(VALUE self) +{ + rb_ary_clear(GET_QUEUE_QUE(self)); + wakeup_all_threads(GET_SZQUEUE_WAITERS(self)); + return self; +} + +/* * Document-method: SizedQueue#num_waiting * * Returns the number of threads waiting on the queue. @@ -586,6 +600,7 @@ Init_thread(void) rb_define_method(rb_cSizedQueue, "max=", rb_szqueue_max_set, 1); rb_define_method(rb_cSizedQueue, "push", rb_szqueue_push, 1); rb_define_method(rb_cSizedQueue, "pop", rb_szqueue_pop, -1); + rb_define_method(rb_cSizedQueue, "clear", rb_szqueue_clear, 0); rb_define_method(rb_cSizedQueue, "num_waiting", rb_szqueue_num_waiting, 0); /* Alias for #push. */ |