Refactor the internal data format for coverage measurement

To prepare new measuring targets: branch and method coverages.
So far, iseq->coverage was an array of counts executed for line coverage.
Now, it is a three-element array for each measuring target,
whose first element is an array for line coverage.
The second element is planned for branch coverage, and the third will be
for method coverage.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59738 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 51 insertions, 17 deletions

diff --git a/thread.c b/thread.c
index 2e0713e54f..766b3d4100 100644
--- a/thread.c
+++ b/thread.c
@@ -4090,13 +4090,17 @@ static int
 clear_coverage_i(st_data_t key, st_data_t val, st_data_t dummy)
 {
     int i;
-    VALUE lines = (VALUE)val;
+    VALUE coverage = (VALUE)val;
+    VALUE lines = RARRAY_AREF(coverage, COVERAGE_INDEX_LINES);
 
-    for (i = 0; i < RARRAY_LEN(lines); i++) {
-	if (RARRAY_AREF(lines, i) != Qnil) {
-	    RARRAY_ASET(lines, i, INT2FIX(0));
+    if (lines) {
+	for (i = 0; i < RARRAY_LEN(lines); i++) {
+	    if (RARRAY_AREF(lines, i) != Qnil) {
+		RARRAY_ASET(lines, i, INT2FIX(0));
+	    }
 	}
     }
+
     return ST_CONTINUE;
 }
 
@@ -4970,17 +4974,20 @@ update_coverage(rb_event_flag_t event, VALUE proc, VALUE self, ID id, VALUE klas
 {
     VALUE coverage = rb_iseq_coverage(GET_THREAD()->ec.cfp->iseq);
     if (RB_TYPE_P(coverage, T_ARRAY) && !RBASIC_CLASS(coverage)) {
-	long line = rb_sourceline() - 1;
-	long count;
-	VALUE num;
-	if (line >= RARRAY_LEN(coverage)) { /* no longer tracked */
-	    return;
-	}
-	num = RARRAY_AREF(coverage, line);
-	if (!FIXNUM_P(num)) return;
-	count = FIX2LONG(num) + 1;
-	if (POSFIXABLE(count)) {
-	    RARRAY_ASET(coverage, line, LONG2FIX(count));
+	VALUE lines = RARRAY_AREF(coverage, COVERAGE_INDEX_LINES);
+	if (lines) {
+	    long line = rb_sourceline() - 1;
+	    long count;
+	    VALUE num;
+	    if (line >= RARRAY_LEN(lines)) { /* no longer tracked */
+		return;
+	    }
+	    num = RARRAY_AREF(lines, line);
+	    if (!FIXNUM_P(num)) return;
+	    count = FIX2LONG(num) + 1;
+	    if (POSFIXABLE(count)) {
+		RARRAY_ASET(lines, line, LONG2FIX(count));
+	    }
 	}
     }
 }
@@ -4992,9 +4999,10 @@ rb_get_coverages(void)
 }
 
 void
-rb_set_coverages(VALUE coverages)
+rb_set_coverages(VALUE coverages, int mode)
 {
     GET_VM()->coverages = coverages;
+    GET_VM()->coverage_mode = mode;
     rb_add_event_hook(update_coverage, RUBY_EVENT_COVERAGE, Qnil);
 }
 
@@ -5003,7 +5011,8 @@ static int
 reset_coverage_i(st_data_t key, st_data_t val, st_data_t dummy)
 {
     VALUE coverage = (VALUE)val;
-    rb_ary_clear(coverage);
+    VALUE lines = RARRAY_AREF(coverage, COVERAGE_INDEX_LINES);
+    rb_ary_clear(lines);
     return ST_CONTINUE;
 }
 
@@ -5017,6 +5026,31 @@ rb_reset_coverages(void)
 }
 
 VALUE
+rb_default_coverage(int n)
+{
+    VALUE coverage = rb_ary_tmp_new_fill(3);
+    VALUE lines = Qfalse, branches = Qfalse, methods = Qfalse;
+    int mode = GET_VM()->coverage_mode;
+
+    if (mode & COVERAGE_TARGET_LINES) {
+	lines = n > 0 ? rb_ary_tmp_new_fill(n) : rb_ary_tmp_new(0);
+    }
+    RARRAY_ASET(coverage, COVERAGE_INDEX_LINES, lines);
+
+    if (mode & COVERAGE_TARGET_BRANCHES) {
+	/* not implemented yet */
+    }
+    RARRAY_ASET(coverage, COVERAGE_INDEX_BRANCHES, branches);
+
+    if (mode & COVERAGE_TARGET_METHODS) {
+	/* not implemented yet */
+    }
+    RARRAY_ASET(coverage, COVERAGE_INDEX_METHODS, methods);
+
+    return coverage;
+}
+
+VALUE
 rb_uninterruptible(VALUE (*b_proc)(ANYARGS), VALUE data)
 {
     VALUE interrupt_mask = rb_ident_hash_new();