1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

thread/thread.c: simplify

Browse Source 
* ext/thread/thread.c (queue_pop_should_block): returns int
  instead of VALUE, and use rb_check_arity.

* ext/thread/thread.c (szqueue_push_should_block): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46853 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-07-17 10:57:31 +00:00
parent 4c849f0e62
commit 083c5896ca
1 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
ext/thread/thread.c
View File

@ -262,14 +262,14 @@ queue_sleep(VALUE arg)
} }
static VALUE static VALUE
queue_do_pop(VALUE self, VALUE should_block) queue_do_pop(VALUE self, int should_block)
{ {
struct waiting_delete args; struct waiting_delete args;
args.waiting = GET_QUEUE_WAITERS(self); args.waiting = GET_QUEUE_WAITERS(self);
args.th = rb_thread_current(); args.th = rb_thread_current();
while (queue_length(self) == 0) { while (queue_length(self) == 0) {
if (!(int)should_block) { if (!should_block) {
rb_raise(rb_eThreadError, "queue empty"); rb_raise(rb_eThreadError, "queue empty");
} }
rb_ary_push(args.waiting, args.th); rb_ary_push(args.waiting, args.th);
@ -279,18 +279,13 @@ queue_do_pop(VALUE self, VALUE should_block)
return rb_ary_shift(GET_QUEUE_QUE(self)); return rb_ary_shift(GET_QUEUE_QUE(self));
} }
static VALUE static int
queue_pop_should_block(int argc, VALUE *argv) queue_pop_should_block(int argc, const VALUE *argv)
{ {
VALUE should_block = Qtrue; int should_block = 1;
switch (argc) { rb_check_arity(argc, 0, 1);
case 0: if (argc > 0) {
break; should_block = !RTEST(argv[0]);
case 1:
should_block = RTEST(argv[0]) ? Qfalse : Qtrue;
break;
default:
rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
} }
return should_block; return should_block;
} }
@ -312,7 +307,7 @@ queue_pop_should_block(int argc, VALUE *argv)
static VALUE static VALUE
rb_queue_pop(int argc, VALUE *argv, VALUE self) rb_queue_pop(int argc, VALUE *argv, VALUE self)
{ {
VALUE should_block = queue_pop_should_block(argc, argv); int should_block = queue_pop_should_block(argc, argv);
return queue_do_pop(self, should_block); return queue_do_pop(self, should_block);
} }
@ -443,21 +438,13 @@ rb_szqueue_max_set(VALUE self, VALUE vmax)
return vmax; return vmax;
} }
static VALUE static int
szqueue_push_should_block(int argc, VALUE *argv) szqueue_push_should_block(int argc, const VALUE *argv)
{ {
VALUE should_block = Qtrue; int should_block = 1;
switch (argc) { rb_check_arity(argc, 1, 2);
case 0: if (argc > 1) {
rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)"); should_block = !RTEST(argv[1]);
break;
case 1:
break;
case 2:
should_block = RTEST(argv[1]) ? Qfalse : Qtrue;
break;
default:
rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
} }
return should_block; return should_block;
} }
@ -480,12 +467,12 @@ static VALUE
rb_szqueue_push(int argc, VALUE *argv, VALUE self) rb_szqueue_push(int argc, VALUE *argv, VALUE self)
{ {
struct waiting_delete args; struct waiting_delete args;
VALUE should_block = szqueue_push_should_block(argc, argv); int should_block = szqueue_push_should_block(argc, argv);
args.waiting = GET_SZQUEUE_WAITERS(self); args.waiting = GET_SZQUEUE_WAITERS(self);
args.th = rb_thread_current(); args.th = rb_thread_current();
while (queue_length(self) >= GET_SZQUEUE_ULONGMAX(self)) { while (queue_length(self) >= GET_SZQUEUE_ULONGMAX(self)) {
if (!(int)should_block) { if (!should_block) {
rb_raise(rb_eThreadError, "queue full"); rb_raise(rb_eThreadError, "queue full");
} }
rb_ary_push(args.waiting, args.th); rb_ary_push(args.waiting, args.th);
@ -495,7 +482,7 @@ rb_szqueue_push(int argc, VALUE *argv, VALUE self)
} }
static VALUE static VALUE
szqueue_do_pop(VALUE self, VALUE should_block) szqueue_do_pop(VALUE self, int should_block)
{ {
VALUE retval = queue_do_pop(self, should_block); VALUE retval = queue_do_pop(self, should_block);
@ -523,7 +510,7 @@ szqueue_do_pop(VALUE self, VALUE should_block)
static VALUE static VALUE
rb_szqueue_pop(int argc, VALUE *argv, VALUE self) rb_szqueue_pop(int argc, VALUE *argv, VALUE self)
{ {
VALUE should_block = queue_pop_should_block(argc, argv); int should_block = queue_pop_should_block(argc, argv);
return szqueue_do_pop(self, should_block); return szqueue_do_pop(self, should_block);
} }