mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/coverage/coverage.c: make it restartable. [ruby-core:36539]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
8dddc12ad7
commit
7023a64d80
2 changed files with 21 additions and 9 deletions
|
@ -1,3 +1,7 @@
|
||||||
|
Tue Jun 14 01:05:10 2011 Yusuke Endoh <mame@tsg.ne.jp>
|
||||||
|
|
||||||
|
* ext/coverage/coverage.c: make it restartable. [ruby-core:36539]
|
||||||
|
|
||||||
Mon Jun 13 23:55:40 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
Mon Jun 13 23:55:40 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
||||||
|
|
||||||
* thread.c (rb_thread_schedule_rec): call gvl_yield() unconditionally.
|
* thread.c (rb_thread_schedule_rec): call gvl_yield() unconditionally.
|
||||||
|
|
|
@ -11,6 +11,8 @@
|
||||||
#include "ruby.h"
|
#include "ruby.h"
|
||||||
#include "vm_core.h"
|
#include "vm_core.h"
|
||||||
|
|
||||||
|
static VALUE rb_coverages = Qundef;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* call-seq:
|
* call-seq:
|
||||||
* Coverage.start => nil
|
* Coverage.start => nil
|
||||||
|
@ -21,19 +23,25 @@ static VALUE
|
||||||
rb_coverage_start(VALUE klass)
|
rb_coverage_start(VALUE klass)
|
||||||
{
|
{
|
||||||
if (!RTEST(rb_get_coverages())) {
|
if (!RTEST(rb_get_coverages())) {
|
||||||
VALUE coverages = rb_hash_new();
|
if (rb_coverages == Qundef) {
|
||||||
RBASIC(coverages)->klass = 0;
|
rb_coverages = rb_hash_new();
|
||||||
rb_set_coverages(coverages);
|
RBASIC(rb_coverages)->klass = 0;
|
||||||
|
}
|
||||||
|
rb_set_coverages(rb_coverages);
|
||||||
}
|
}
|
||||||
return Qnil;
|
return Qnil;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
coverage_result_i(st_data_t key, st_data_t val, st_data_t dummy)
|
coverage_result_i(st_data_t key, st_data_t val, st_data_t h)
|
||||||
{
|
{
|
||||||
|
VALUE path = (VALUE)key;
|
||||||
VALUE coverage = (VALUE)val;
|
VALUE coverage = (VALUE)val;
|
||||||
RBASIC(coverage)->klass = rb_cArray;
|
VALUE coverages = (VALUE)h;
|
||||||
|
coverage = rb_ary_dup(coverage);
|
||||||
|
rb_ary_clear((VALUE)val);
|
||||||
rb_ary_freeze(coverage);
|
rb_ary_freeze(coverage);
|
||||||
|
rb_hash_aset(coverages, path, coverage);
|
||||||
return ST_CONTINUE;
|
return ST_CONTINUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,14 +56,14 @@ static VALUE
|
||||||
rb_coverage_result(VALUE klass)
|
rb_coverage_result(VALUE klass)
|
||||||
{
|
{
|
||||||
VALUE coverages = rb_get_coverages();
|
VALUE coverages = rb_get_coverages();
|
||||||
|
VALUE ncoverages = rb_hash_new();
|
||||||
if (!RTEST(coverages)) {
|
if (!RTEST(coverages)) {
|
||||||
rb_raise(rb_eRuntimeError, "coverage measurement is not enabled");
|
rb_raise(rb_eRuntimeError, "coverage measurement is not enabled");
|
||||||
}
|
}
|
||||||
RBASIC(coverages)->klass = rb_cHash;
|
st_foreach(RHASH_TBL(coverages), coverage_result_i, ncoverages);
|
||||||
st_foreach(RHASH_TBL(coverages), coverage_result_i, 0);
|
rb_hash_freeze(ncoverages);
|
||||||
rb_hash_freeze(coverages);
|
|
||||||
rb_reset_coverages();
|
rb_reset_coverages();
|
||||||
return coverages;
|
return ncoverages;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Coverage provides coverage measurement feature for Ruby.
|
/* Coverage provides coverage measurement feature for Ruby.
|
||||||
|
|
Loading…
Reference in a new issue