thread.c: no function callsin RARRAY_LEN

* ext/thread/thread.c (queue_length, queue_num_waiting): avoid
  function calls in RARRAY_LEN macro which evaluates the argument
  multiple times.

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-11-07 16:36:16 +00:00
Родитель 72ce1a4759
Коммит 13d241489a
1 изменённых файлов: 6 добавлений и 3 удалений

Просмотреть файл

@ -243,13 +243,15 @@ rb_queue_push(VALUE self, VALUE obj)
static unsigned long static unsigned long
queue_length(VALUE self) queue_length(VALUE self)
{ {
return RARRAY_LEN(GET_QUEUE_QUE(self)); VALUE que = GET_QUEUE_QUE(self);
return RARRAY_LEN(que);
} }
static unsigned long static unsigned long
queue_num_waiting(VALUE self) queue_num_waiting(VALUE self)
{ {
return RARRAY_LEN(GET_QUEUE_WAITERS(self)); VALUE waiters = GET_QUEUE_WAITERS(self);
return RARRAY_LEN(waiters);
} }
struct waiting_delete { struct waiting_delete {
@ -548,7 +550,8 @@ static VALUE
rb_szqueue_num_waiting(VALUE self) rb_szqueue_num_waiting(VALUE self)
{ {
long len = queue_num_waiting(self); long len = queue_num_waiting(self);
len += RARRAY_LEN(GET_SZQUEUE_WAITERS(self)); VALUE waiters = GET_SZQUEUE_WAITERS(self);
len += RARRAY_LEN(waiters);
return ULONG2NUM(len); return ULONG2NUM(len);
} }