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

* array.c (rb_ary_sample): use frozen shared array to get rid of

Browse Source 
reallocation.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-08-25 08:56:47 +00:00
parent c6465aeeb1
commit 569d821929
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Aug 25 17:56:40 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_sample): use frozen shared array to get rid of
reallocation.
Wed Aug 25 03:42:43 2010 NAKAMURA Usaku <usa@ruby-lang.org> Wed Aug 25 03:42:43 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/dl/cfunc.c (rb_dlcfunc_call): workaround for VC9 for x64. * ext/dl/cfunc.c (rb_dlcfunc_call): workaround for VC9 for x64.

2
array.c
View File

@ -3826,6 +3826,7 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
rb_scan_args(argc, argv, "1", &nv); rb_scan_args(argc, argv, "1", &nv);
n = NUM2LONG(nv); n = NUM2LONG(nv);
if (n < 0) rb_raise(rb_eArgError, "negative sample number"); if (n < 0) rb_raise(rb_eArgError, "negative sample number");
RB_GC_GUARD(ary) = ary_make_shared(ary);
ptr = RARRAY_PTR(ary); ptr = RARRAY_PTR(ary);
len = RARRAY_LEN(ary); len = RARRAY_LEN(ary);
if (n > len) n = len; if (n > len) n = len;
@ -3872,7 +3873,6 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
VALUE *ptr_result; VALUE *ptr_result;
result = rb_ary_new4(len, ptr); result = rb_ary_new4(len, ptr);
ptr_result = RARRAY_PTR(result); ptr_result = RARRAY_PTR(result);
RB_GC_GUARD(ary);
for (i=0; i<n; i++) { for (i=0; i<n; i++) {
j = RAND_UPTO(len-i) + i; j = RAND_UPTO(len-i) + i;
nv = ptr_result[j]; nv = ptr_result[j];