kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

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

Browse source 
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
This commit is contained in:
mame 2008-07-03 12:55:12 +00:00
parent 16519f1ff9
commit f08581c7b6
11 changed files with 99 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ChangeLog
View file

@ -1,3 +1,32 @@
Thu Jul 3 21:51:21 2008 Yusuke Endoh <mame@tsg.ne.jp>
* 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__.
Thu Jul 3 21:20:45 2008 Yusuke Endoh <mame@tsg.ne.jp>
* thread.c (thread_initialize): NUM2INT returns long.

11
ext/coverage/coverage.c Normal file
View file

@ -0,0 +1,11 @@
#include "ruby.h"
VALUE rb_mCoverage;
void
Init_coverage(void)
{
rb_enable_coverages();
rb_mCoverage = rb_define_module("Coverage");
rb_define_module_function(rb_mCoverage, "result", rb_get_coverages, 0);
}

2
ext/coverage/extconf.rb Normal file
View file

@ -0,0 +1,2 @@
require 'mkmf'
create_makefile('coverage')

2
include/ruby/intern.h
View file

@ -626,6 +626,8 @@ VALUE rb_mutex_synchronize(VALUE self);
VALUE rb_barrier_new(void);
VALUE rb_barrier_wait(VALUE self);
VALUE rb_barrier_release(VALUE self);
VALUE rb_get_coverages(void);
void rb_enable_coverages(void);
/* time.c */
VALUE rb_time_new(time_t, long);
VALUE rb_time_nano_new(time_t, long);

18
insns.def
View file

@ -853,23 +853,7 @@ trace
{
rb_event_flag_t flag = nf;
if (flag == RUBY_EVENT_COVERAGE) {
VALUE coverage = GET_ISEQ()->coverage;
if (coverage) {
long line = vm_get_sourceline(GET_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);
}
}
}
else {
EXEC_EVENT_HOOK(th, flag, GET_SELF(), 0, 0 /* TODO: id, klass */);
}
EXEC_EVENT_HOOK(th, flag, GET_SELF(), 0, 0 /* TODO: id, klass */);
}
/**********************************************************/

10
iseq.c
View file

@ -194,12 +194,10 @@ prepare_iseq_build(rb_iseq_t *iseq,
iseq->coverage = Qfalse;
if (!GET_THREAD()->parse_in_eval) {
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) {
iseq->coverage = rb_hash_aref(hash, filename);
if (NIL_P(iseq->coverage)) iseq->coverage = Qfalse;
}
VALUE coverages = rb_get_coverages();
if (RTEST(coverages)) {
iseq->coverage = rb_hash_aref(coverages, filename);
if (NIL_P(iseq->coverage)) iseq->coverage = Qfalse;
}
}

5
lib/coverage.rb
View file

@ -1,4 +1,5 @@
COVERAGE__ ||= {}
require "coverage.so"
ext = ENV["COVERUBY_EXT"] || ".cov"
accum = ENV["COVERUBY_ACCUM"]
accum = !accum || accum == "" || !(%w(f n 0).include?(accum[0]))
@ -6,7 +7,7 @@ pwd = Dir.pwd
at_exit do
Dir.chdir(pwd) do
COVERAGE__.each do |sfile, covs|
Coverage.result.each do |sfile, covs|
cfile = sfile + ext
writable = proc do |f|

20
parse.y
View file

@ -4672,17 +4672,15 @@ debug_lines(const char *f)
static VALUE
coverage(const char *f, int n)
{
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) {
VALUE fname = rb_str_new2(f);
VALUE lines = rb_ary_new2(n);
int i;
for (i = 0; i < n; i++) RARRAY_PTR(lines)[i] = Qnil;
RARRAY(lines)->len = n;
rb_hash_aset(hash, fname, lines);
return lines;
}
VALUE coverages = rb_get_coverages();
if (RTEST(coverages)) {
VALUE fname = rb_str_new2(f);
VALUE lines = rb_ary_new2(n);
int i;
for (i = 0; i < n; i++) RARRAY_PTR(lines)[i] = Qnil;
RARRAY(lines)->len = n;
rb_hash_aset(coverages, fname, lines);
return lines;
}
return 0;
}

41
thread.c
View file

@ -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);
}
}

1
vm.c
View file

@ -1395,6 +1395,7 @@ rb_vm_mark(void *ptr)
RUBY_MARK_UNLESS_NULL(vm->load_path);
RUBY_MARK_UNLESS_NULL(vm->loaded_features);
RUBY_MARK_UNLESS_NULL(vm->top_self);
RUBY_MARK_UNLESS_NULL(vm->coverages);
rb_gc_mark_locations(vm->special_exceptions, vm->special_exceptions + ruby_special_error_count - 1);
if (vm->loading_table) {

1
vm_core.h
View file

@ -333,6 +333,7 @@ struct rb_vm_struct
int src_encoding_index;
VALUE verbose, debug, progname;
VALUE coverages;
#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
struct rb_objspace *objspace;