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

ext/coverage/coverage.c: use long instead of int for coverage site id

Browse Source 
Coverage generates unique ID numbers for each branch and each method.
Use long instead of int for the IDs.  I don't want to see 2^32 branches
and methods in one file, but just in case...

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2017-09-14 10:45:04 +00:00
parent fff6809b30
commit b324a64946
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/coverage/coverage.c
View File

@ -73,19 +73,20 @@ branch_coverage(VALUE branches)
VALUE ret = rb_hash_new(); VALUE ret = rb_hash_new();
VALUE structure = rb_ary_dup(RARRAY_AREF(branches, 0)); VALUE structure = rb_ary_dup(RARRAY_AREF(branches, 0));
VALUE counters = rb_ary_dup(RARRAY_AREF(branches, 1)); VALUE counters = rb_ary_dup(RARRAY_AREF(branches, 1));
int i, j, id = 0; int i, j;
long id = 0;
for (i = 0; i < RARRAY_LEN(structure); i++) { for (i = 0; i < RARRAY_LEN(structure); i++) {
VALUE branches = RARRAY_AREF(structure, i); VALUE branches = RARRAY_AREF(structure, i);
VALUE base_type = RARRAY_AREF(branches, 0); VALUE base_type = RARRAY_AREF(branches, 0);
VALUE base_lineno = RARRAY_AREF(branches, 1); VALUE base_lineno = RARRAY_AREF(branches, 1);
VALUE children = rb_hash_new(); VALUE children = rb_hash_new();
rb_hash_aset(ret, rb_ary_new_from_args(3, base_type, INT2FIX(id++), base_lineno), children); rb_hash_aset(ret, rb_ary_new_from_args(3, base_type, LONG2FIX(id++), base_lineno), children);
for (j = 2; j < RARRAY_LEN(branches); j += 3) { for (j = 2; j < RARRAY_LEN(branches); j += 3) {
VALUE target_label = RARRAY_AREF(branches, j); VALUE target_label = RARRAY_AREF(branches, j);
VALUE target_lineno = RARRAY_AREF(branches, j + 1); VALUE target_lineno = RARRAY_AREF(branches, j + 1);
int idx = FIX2INT(RARRAY_AREF(branches, j + 2)); int idx = FIX2INT(RARRAY_AREF(branches, j + 2));
rb_hash_aset(children, rb_ary_new_from_args(3, target_label, INT2FIX(id++), target_lineno), RARRAY_AREF(counters, idx)); rb_hash_aset(children, rb_ary_new_from_args(3, target_label, LONG2FIX(id++), target_lineno), RARRAY_AREF(counters, idx));
} }
} }
@ -96,13 +97,14 @@ static VALUE
method_coverage(VALUE methods) method_coverage(VALUE methods)
{ {
VALUE ret = rb_hash_new(); VALUE ret = rb_hash_new();
int i, id = 0; int i;
long id = 0;
for (i = 0; i < RARRAY_LEN(methods); ) { for (i = 0; i < RARRAY_LEN(methods); ) {
VALUE method_name = RARRAY_AREF(methods, i++); VALUE method_name = RARRAY_AREF(methods, i++);
VALUE lineno = RARRAY_AREF(methods, i++); VALUE lineno = RARRAY_AREF(methods, i++);
VALUE counter = RARRAY_AREF(methods, i++); VALUE counter = RARRAY_AREF(methods, i++);
rb_hash_aset(ret, rb_ary_new_from_args(3, method_name, INT2FIX(id++), lineno), counter); rb_hash_aset(ret, rb_ary_new_from_args(3, method_name, LONG2FIX(id++), lineno), counter);
} }
return ret; return ret;