* ext/coverage/coverage.c, ext/coverage/extconf.rb: eliminate

  COVERAGE__ and introduce coverage.so instead.  How to measure
  coverage: (1) require "coverage.so", (2) require or load Ruby source
  file, and (3) Coverage.result will return the same hash as COVERAGE__.
  [ruby-dev:35324]

* thread.c (rb_enable_coverages): start coverage measurement by using
  rb_add_event_hook.

* thread.c (rb_get_coverages): returns current results of coverage
  measurement.

* include/ruby/intern.h: add prototype for above two functions.

* vm_core.h, vm.c: add field of coverages to rb_vm_t.

* insns.def (trace): remove special handling for COVERAGE__.

* iseq.c (prepare_iseq_build): switch COVERAGE__ to
  rb_get_coverages().

* parse.y (coverage): ditto.

* thread.c (clear_coverage): ditto.

* lib/coverage.rb: use coverage.so instead of COVERAGE__.


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

1 files changed, 36 insertions, 5 deletions

diff --git a/thread.c b/thread.c
index 432a91d331..36af5af49d 100644
--- a/thread.c
+++ b/thread.c
@@ -2116,11 +2116,9 @@ clear_coverage_i(st_data_t key, st_data_t val, st_data_t dummy)
 static void
 clear_coverage(void)
 {
-    if (rb_const_defined_at(rb_cObject, rb_intern("COVERAGE__"))) {
-	VALUE hash = rb_const_get_at(rb_cObject, rb_intern("COVERAGE__"));
-	if (TYPE(hash) == T_HASH) {
-	    st_foreach(RHASH_TBL(hash), clear_coverage_i, 0);
-	}
+    VALUE coverages = rb_get_coverages();
+    if (RTEST(coverages)) {
+	st_foreach(RHASH_TBL(coverages), clear_coverage_i, 0);
     }
 }
 
@@ -3530,3 +3528,36 @@ rb_check_deadlock(rb_vm_t *vm)
 	rb_thread_raise(2, argv, vm->main_thread);
     }
 }
+
+VALUE
+rb_get_coverages(void)
+{
+    return GET_VM()->coverages;
+}
+
+static void
+update_coverage(rb_event_flag_t event, VALUE proc, VALUE self, ID id, VALUE klass)
+{
+    rb_control_frame_t *cfp = GET_THREAD()->cfp;
+    VALUE coverage = cfp->iseq->coverage;
+    if (coverage) {
+	long line = vm_get_sourceline(cfp) - 1;
+	long count;
+	if (RARRAY_PTR(coverage)[line] == Qnil) {
+	    rb_bug("bug");
+	}
+	count = FIX2LONG(RARRAY_PTR(coverage)[line]) + 1;
+	if (POSFIXABLE(count)) {
+	    RARRAY_PTR(coverage)[line] = LONG2FIX(count);
+	}
+    }
+}
+
+void
+rb_enable_coverages(void)
+{
+    if (!RTEST(GET_VM()->coverages)) {
+	GET_VM()->coverages = rb_hash_new();
+	rb_add_event_hook(update_coverage, RUBY_EVENT_COVERAGE, Qnil);
+    }
+}