* thread.c (rb_set_coverages, rb_reset_coverages): enable and disable

  coverage measurement.

* thread.c (rb_get_coverages): rename and move from vm.c.

* vm.c (rb_vm_get_coverages): ditto.

* iseq.c (prepare_iseq_build): ditto.

* thread.c (clear_coverage): ditto.

* parse.y (coverage): ditto.

* ext/coverage/coverage.c: use above functions, add new method
  Coverage.start and fix rdoc .


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

1 files changed, 12 insertions, 27 deletions

diff --git a/thread.c b/thread.c
index 789d2b20e0..5ede10c600 100644
--- a/thread.c
+++ b/thread.c
@@ -2117,8 +2117,8 @@ clear_coverage_i(st_data_t key, st_data_t val, st_data_t dummy)
 static void
 clear_coverage(void)
 {
-    extern VALUE rb_vm_get_coverages(void);
-    VALUE coverages = rb_vm_get_coverages();
+    extern VALUE rb_get_coverages(void);
+    VALUE coverages = rb_get_coverages();
     if (RTEST(coverages)) {
 	st_foreach(RHASH_TBL(coverages), clear_coverage_i, 0);
     }
@@ -3548,37 +3548,22 @@ update_coverage(rb_event_flag_t event, VALUE proc, VALUE self, ID id, VALUE klas
     }
 }
 
-static int
-coverage_result_i(st_data_t key, st_data_t val, st_data_t dummy)
+VALUE
+rb_get_coverages(void)
 {
-    VALUE coverage = (VALUE)val;
-    RBASIC(coverage)->klass = rb_cArray;
-    rb_ary_freeze(coverage);
-    return ST_CONTINUE;
+    return GET_VM()->coverages;
 }
 
-static VALUE
-rb_coverage_result(VALUE klass)
+void
+rb_set_coverages(VALUE coverages)
 {
-    extern VALUE rb_vm_get_coverages(void);
-    VALUE coverages = rb_vm_get_coverages();
-    st_foreach(RHASH_TBL(coverages), coverage_result_i, 0);
-    RBASIC(coverages)->klass = rb_cHash;
-    rb_hash_freeze(coverages);
-    return coverages;
+    GET_VM()->coverages = coverages;
+    rb_add_event_hook(update_coverage, RUBY_EVENT_COVERAGE, Qnil);
 }
 
 void
-rb_enable_coverages(void)
+rb_reset_coverages(void)
 {
-    VALUE rb_mCoverage;
-
-    if (!RTEST(GET_VM()->coverages)) {
-	VALUE coverages = rb_hash_new();
-	RBASIC(coverages)->klass = 0;
-	GET_VM()->coverages = coverages;
-	rb_add_event_hook(update_coverage, RUBY_EVENT_COVERAGE, Qnil);
-	rb_mCoverage = rb_define_module("Coverage");
-	rb_define_module_function(rb_mCoverage, "result", rb_coverage_result, 0);
-    }
+    GET_VM()->coverages = Qfalse;
+    rb_remove_event_hook(update_coverage);
 }