rcov 0.6.0.1 → 0.7.0.1

data/BLURB

@@ -2,7 +2,7 @@
 Source code, additional information, screenshots... available at 
     http://eigenclass.org/hiki.rb?rcov
 Release information:
-    http://eigenclass.org/hiki.rb?rcov+0.6.0
+    http://eigenclass.org/hiki.rb?rcov+0.7.0
 
 If you're on win32, you can also find a pre-built rcovrt.so (which makes
 code coverage analysis >100 times faster) in the above-mentioned pages.

data/CHANGES

@@ -1,6 +1,24 @@
 
 User-visible changes.
 
+Since 0.6.0 (2006-06-12)
+========================
+Features
+--------
+* coverage/callsite data from multiple runs can be aggregated (--aggregate) 
+
+Bugfixes
+--------
+* the SCRIPT_LINES__ workaround works better
+* fixed silly bug in coverage data acquisition (line after the correct one
+  marked in some situations)
+* avoid problems with repeated path separators in default ignore list, based
+  on rbconfig's data
+
+
+Minor enhancements
+------------------
+
 Since 0.5.0 (2006-05-30)
 ========================
 Features

data/Rakefile

@@ -48,7 +48,7 @@ Rake::TestTask.new(:test_rcovrt => ["ext/rcovrt/rcovrt.so"]) do |t|
   t.verbose = true
 end
 
-file "ext/rcovrt/rcovrt.so" => "ext/rcovrt/rcov.c" do
+file "ext/rcovrt/rcovrt.so" => FileList["ext/rcovrt/*.c"] do
   ruby "setup.rb config"
   ruby "setup.rb setup"
 end
@@ -87,9 +87,10 @@ PKG_FILES = FileList[
 "bin/rcov",
 "lib/**/*.rb",
 "ext/rcovrt/extconf.rb",
-"ext/rcovrt/rcov.c",
+"ext/rcovrt/*.c",
+"ext/rcovrt/*.h",
 "LEGAL", "LICENSE", "Rakefile", "Rantfile", "README.*", "THANKS", "test/*.rb",
-"mingw-rbconfig.rb",
+"mingw-rbconfig.rb", "rcov.vim",
 "setup.rb", "BLURB", "CHANGES"
 ]
 

data/THANKS

@@ -41,3 +41,12 @@ Coda Hale:
 Tim Shadel:
 * reported that the last comment block was not being marked even when
   it was the last thing in the file
+
+Thomas Leitner:
+* reported that the SCRIPT_LINES__ workaround did not always work
+
+Assaph Mehr:
+* beta-tested 0.7.0 and found a bug in --aggregate (missing files)
+
+Ryan Kinderman:
+* suggested that -Ipath be passed to ruby instead of rcov in RcovTasks

data/bin/rcov

@@ -56,6 +56,7 @@ options.coverage_diff_mode = :compare
 options.coverage_diff_save = false
 options.diff_cmd = "diff"
 options.report_cov_bug_for = nil
+options.aggregate_file = nil
 
 EXTRA_HELP = <<-EOF
 
@@ -165,6 +166,12 @@ EOF
             "ANSI color sequences unless -n.") do
         options.textmode = :coverage
     end
+    opts.on("--aggregate FILE", "Aggregate data from previous runs",
+                                "in FILE. Overwrites FILE with the",
+                                "merged data. FILE is created if",
+                                "necessary.") do |file|
+      options.aggregate_file = file
+    end
     opts.on("-D [FILE]", "--text-coverage-diff [FILE]",
             "Compare code coverage with saved state",
             "in FILE, defaults to coverage.info.",
@@ -177,7 +184,8 @@ EOF
         options.coverage_diff_mode = :compare
         options.coverage_diff_file = file if file && !file.empty?
     end
-    opts.on("--save [FILE]", "Save coverage data to FILE.",
+    opts.on("--save [FILE]", "Save coverage data to FILE,",
+            "for later use with rcov -D.",
             "(default: coverage.info)") do |file|
         options.coverage_diff_save = true
         options.coverage_diff_mode = :record
@@ -289,8 +297,33 @@ require 'rcov'
 
 options.callsites = true if options.report_cov_bug_for
 
+def rcov_load_aggregate_data(file)
+    require 'zlib'
+    begin
+        old_data = nil
+        Zlib::GzipReader.open(file){|gz| old_data = Marshal.load(gz) }
+    rescue
+        old_data = {}
+    end
+    old_data || {}
+end
+
+def rcov_save_aggregate_data(file)
+    require 'zlib'
+    Zlib::GzipWriter.open(file) do |f|
+        Marshal.dump({:callsites => $rcov_callsite_analyzer, 
+                     :coverage => $rcov_code_coverage_analyzer}, f)
+    end
+end
+
 if options.callsites 
-    $rcov_callsite_analyzer = Rcov::CallSiteAnalyzer.new
+    if options.aggregate_file
+        saved_aggregate_data = rcov_load_aggregate_data(options.aggregate_file)
+        if saved_aggregate_data[:callsites]
+            $rcov_callsite_analyzer = saved_aggregate_data[:callsites]
+        end
+    end
+    $rcov_callsite_analyzer ||= Rcov::CallSiteAnalyzer.new
     $rcov_callsite_analyzer.install_hook
 else
     $rcov_callsite_analyzer = nil
@@ -333,12 +366,19 @@ end
 
 formatters << make_formatter[Rcov::TextCoverageDiff] if options.coverage_diff_save
 
-$rcov_code_coverage_analyzer = Rcov::CodeCoverageAnalyzer.new
+if options.aggregate_file
+    saved_aggregate_data ||= rcov_load_aggregate_data(options.aggregate_file)
+    if saved_aggregate_data[:coverage]
+        $rcov_code_coverage_analyzer = saved_aggregate_data[:coverage]
+    end
+end
+$rcov_code_coverage_analyzer ||= Rcov::CodeCoverageAnalyzer.new
 
 # must be registered before test/unit puts its own
 END {
     $rcov_code_coverage_analyzer.remove_hook
     $rcov_callsite_analyzer.remove_hook if $rcov_callsite_analyzer
+    rcov_save_aggregate_data(options.aggregate_file) if options.aggregate_file
     $rcov_code_coverage_analyzer.dump_coverage_info(formatters)
     if options.report_cov_bug_for
         defsite = $rcov_callsite_analyzer.defsite(options.report_cov_bug_for)

data/ext/rcovrt/callsite.c

@@ -0,0 +1,242 @@
+#include <ruby.h>
+#include <env.h>
+#include <node.h>
+#include <st.h>
+#include <stdlib.h>
+
+
+static char callsite_hook_set_p;
+
+typedef struct {
+        char *sourcefile;
+        unsigned int sourceline;
+        VALUE curr_meth;
+} type_def_site;       
+static VALUE caller_info = 0;
+static VALUE method_def_site_info = 0;
+
+static caller_stack_len = 1;
+
+/*
+ *
+ * callsite hook and associated functions
+ *
+ * */
+
+static VALUE
+record_callsite_info(VALUE args)
+{
+  VALUE caller_ary;
+  VALUE curr_meth;
+  VALUE count_hash;
+  VALUE count;
+  VALUE *pargs = (VALUE *)args;
+
+  caller_ary = pargs[0];
+  curr_meth = pargs[1];
+  count_hash = rb_hash_aref(caller_info, curr_meth);
+  if(TYPE(count_hash) != T_HASH) { 
+          /* Qnil, anything else should be impossible unless somebody's been
+           * messing with ObjectSpace */
+          count_hash = rb_hash_new();
+          rb_hash_aset(caller_info, curr_meth, count_hash);
+  }
+  count = rb_hash_aref(count_hash, caller_ary);
+  if(count == Qnil) 
+          count = INT2FIX(0);
+  count = INT2FIX(FIX2UINT(count) + 1);
+  rb_hash_aset(count_hash, caller_ary, count);
+  /*
+  printf("CALLSITE: %s -> %s   %d\n", RSTRING(rb_inspect(curr_meth))->ptr,
+                  RSTRING(rb_inspect(caller_ary))->ptr, FIX2INT(count));
+  */
+
+  return Qnil;
+}
+
+
+static VALUE
+record_method_def_site(VALUE args)
+{
+  type_def_site *pargs = (type_def_site *)args;
+  VALUE def_site_info;
+  VALUE hash;
+
+  if( RTEST(rb_hash_aref(method_def_site_info, pargs->curr_meth)) )
+          return Qnil;
+  def_site_info = rb_ary_new();
+  rb_ary_push(def_site_info, rb_str_new2(pargs->sourcefile));
+  rb_ary_push(def_site_info, INT2NUM(pargs->sourceline+1));
+  rb_hash_aset(method_def_site_info, pargs->curr_meth, def_site_info);
+  /*
+  printf("DEFSITE: %s:%d  for %s\n", pargs->sourcefile, pargs->sourceline+1,
+                  RSTRING(rb_inspect(pargs->curr_meth))->ptr);
+  */
+  
+  return Qnil;
+}
+
+static VALUE
+callsite_custom_backtrace(int lev)
+{
+  struct FRAME *frame = ruby_frame;
+  VALUE ary;
+  NODE *n;
+  VALUE level;
+  VALUE klass;
+
+  ary = rb_ary_new();
+  if (frame->last_func == ID_ALLOCATOR) {
+          frame = frame->prev;
+  }
+  for (; frame && (n = frame->node); frame = frame->prev) {
+          if (frame->prev && frame->prev->last_func) {
+                  if (frame->prev->node == n) continue;
+                  level = rb_ary_new();
+                  klass = frame->prev->last_class ? frame->prev->last_class : Qnil;
+                  if(TYPE(klass) == T_ICLASS) {
+                          klass = CLASS_OF(klass);
+                  }
+                  rb_ary_push(level, klass);
+                  rb_ary_push(level, ID2SYM(frame->prev->last_func));
+                  rb_ary_push(level, rb_str_new2(n->nd_file));
+                  rb_ary_push(level, INT2NUM(nd_line(n)));
+          }
+          else {
+                  level = rb_ary_new();
+                  rb_ary_push(level, Qnil);
+                  rb_ary_push(level, Qnil);
+                  rb_ary_push(level, rb_str_new2(n->nd_file));
+                  rb_ary_push(level, INT2NUM(nd_line(n)));
+          }
+          rb_ary_push(ary, level);
+          if(--lev == 0)
+                  break;
+  }
+
+  return ary;
+}
+  
+static void
+coverage_event_callsite_hook(rb_event_t event, NODE *node, VALUE self, 
+                ID mid, VALUE klass)
+{
+ VALUE caller_ary;
+ VALUE curr_meth;
+ VALUE args[2];
+ int status;
+
+ caller_ary = callsite_custom_backtrace(caller_stack_len);
+
+ if(TYPE(klass) == T_ICLASS) {
+         klass = CLASS_OF(klass);
+ }
+ curr_meth = rb_ary_new();
+ rb_ary_push(curr_meth, klass);
+ rb_ary_push(curr_meth, ID2SYM(mid));
+
+ args[0] = caller_ary;
+ args[1] = curr_meth;
+ rb_protect(record_callsite_info, (VALUE)args, &status);
+ if(!status && node) {
+         type_def_site args;        
+         
+         args.sourcefile = node->nd_file;
+         args.sourceline = nd_line(node) - 1;
+         args.curr_meth = curr_meth;
+         rb_protect(record_method_def_site, (VALUE)&args, NULL);
+ }
+ if(status)
+         rb_gv_set("$!", Qnil);
+}
+
+
+static VALUE
+cov_install_callsite_hook(VALUE self)
+{
+  if(!callsite_hook_set_p) {
+          if(TYPE(caller_info) != T_HASH)
+                  caller_info = rb_hash_new();
+          callsite_hook_set_p = 1;
+          rb_add_event_hook(coverage_event_callsite_hook, 
+                          RUBY_EVENT_CALL);
+          
+          return Qtrue;
+  } else
+          return Qfalse;
+}
+
+
+static VALUE
+cov_remove_callsite_hook(VALUE self)
+{
+ if(!callsite_hook_set_p) 
+         return Qfalse;
+ else {
+         rb_remove_event_hook(coverage_event_callsite_hook);
+         callsite_hook_set_p = 0;
+         return Qtrue;
+ }
+}
+
+
+static VALUE
+cov_generate_callsite_info(VALUE self)
+{
+  VALUE ret;
+
+  ret = rb_ary_new();
+  rb_ary_push(ret, caller_info);
+  rb_ary_push(ret, method_def_site_info);
+  return ret;
+}
+
+
+static VALUE
+cov_reset_callsite(VALUE self)
+{
+  if(callsite_hook_set_p) {
+	  rb_raise(rb_eRuntimeError, 
+		  "Cannot reset the callsite info in the middle of a traced run.");
+	  return Qnil;
+  }
+
+  caller_info = rb_hash_new();
+  method_def_site_info = rb_hash_new();
+  return Qnil;
+}
+
+void
+Init_rcov_callsite()
+{
+ VALUE mRcov;
+ VALUE mRCOV__;
+ ID id_rcov = rb_intern("Rcov");
+ ID id_coverage__ = rb_intern("RCOV__");
+ ID id_script_lines__ = rb_intern("SCRIPT_LINES__");
+
+ if(rb_const_defined(rb_cObject, id_rcov)) 
+         mRcov = rb_const_get(rb_cObject, id_rcov);
+ else
+         mRcov = rb_define_module("Rcov");
+
+ if(rb_const_defined(mRcov, id_coverage__))
+         mRCOV__ = rb_const_get_at(mRcov, id_coverage__);
+ else
+         mRCOV__ = rb_define_module_under(mRcov, "RCOV__");
+
+ callsite_hook_set_p = 0;
+ caller_info = rb_hash_new();
+ method_def_site_info = rb_hash_new();
+ rb_gc_register_address(&caller_info);
+ rb_gc_register_address(&method_def_site_info);
+ 
+ rb_define_singleton_method(mRCOV__, "install_callsite_hook", 
+                 cov_install_callsite_hook, 0);
+ rb_define_singleton_method(mRCOV__, "remove_callsite_hook", 
+                 cov_remove_callsite_hook, 0);
+ rb_define_singleton_method(mRCOV__, "generate_callsite_info", 
+		 cov_generate_callsite_info, 0);
+ rb_define_singleton_method(mRCOV__, "reset_callsite", cov_reset_callsite, 0);
+}
+/* vim: set sw=8 expandtab: */

data/ext/rcovrt/{rcov.c → rcovrt.c}

@@ -5,6 +5,8 @@
 #include <st.h>
 #include <stdlib.h>
 
+#define COVERAGE_DEBUG_EVENTS 0
+
 #define RCOVRT_VERSION_MAJOR 2
 #define RCOVRT_VERSION_MINOR 0
 #define RCOVRT_VERSION_REV   0
@@ -15,7 +17,6 @@ static VALUE oSCRIPT_LINES__;
 static ID id_cover;
 static st_table* coverinfo = 0;
 static char coverage_hook_set_p;
-static char callsite_hook_set_p;
 
 struct cov_array {
         unsigned int len;
@@ -25,204 +26,6 @@ struct cov_array {
 static struct cov_array *cached_array = 0;
 static char *cached_file = 0; 
 
-typedef struct {
-        char *sourcefile;
-        unsigned int sourceline;
-        VALUE curr_meth;
-} type_def_site;       
-static VALUE caller_info = 0;
-static VALUE method_def_site_info = 0;
-
-static caller_stack_len = 1;
-
-/*
- *
- * callsite hook and associated functions
- *
- * */
-
-static VALUE
-record_callsite_info(VALUE args)
-{
-  VALUE caller_ary;
-  VALUE curr_meth;
-  VALUE count_hash;
-  VALUE count;
-  VALUE *pargs = (VALUE *)args;
-
-  caller_ary = pargs[0];
-  curr_meth = pargs[1];
-  count_hash = rb_hash_aref(caller_info, curr_meth);
-  if(TYPE(count_hash) != T_HASH) { 
-          /* Qnil, anything else should be impossible unless somebody's been
-           * messing with ObjectSpace */
-          count_hash = rb_hash_new();
-          rb_hash_aset(caller_info, curr_meth, count_hash);
-  }
-  count = rb_hash_aref(count_hash, caller_ary);
-  if(count == Qnil) 
-          count = INT2FIX(0);
-  count = INT2FIX(FIX2UINT(count) + 1);
-  rb_hash_aset(count_hash, caller_ary, count);
-  /*
-  printf("CALLSITE: %s -> %s   %d\n", RSTRING(rb_inspect(curr_meth))->ptr,
-                  RSTRING(rb_inspect(caller_ary))->ptr, FIX2INT(count));
-  */
-
-  return Qnil;
-}
-
-
-static VALUE
-record_method_def_site(VALUE args)
-{
-  type_def_site *pargs = (type_def_site *)args;
-  VALUE def_site_info;
-  VALUE hash;
-
-  if( RTEST(rb_hash_aref(method_def_site_info, pargs->curr_meth)) )
-          return Qnil;
-  def_site_info = rb_ary_new();
-  rb_ary_push(def_site_info, rb_str_new2(pargs->sourcefile));
-  rb_ary_push(def_site_info, INT2NUM(pargs->sourceline+1));
-  rb_hash_aset(method_def_site_info, pargs->curr_meth, def_site_info);
-  /*
-  printf("DEFSITE: %s:%d  for %s\n", pargs->sourcefile, pargs->sourceline+1,
-                  RSTRING(rb_inspect(pargs->curr_meth))->ptr);
-  */
-  
-  return Qnil;
-}
-
-static VALUE
-callsite_custom_backtrace(int lev)
-{
-  struct FRAME *frame = ruby_frame;
-  VALUE ary;
-  NODE *n;
-  VALUE level;
-  VALUE klass;
-
-  ary = rb_ary_new();
-  if (frame->last_func == ID_ALLOCATOR) {
-          frame = frame->prev;
-  }
-  for (; frame && (n = frame->node); frame = frame->prev) {
-          if (frame->prev && frame->prev->last_func) {
-                  if (frame->prev->node == n) continue;
-                  level = rb_ary_new();
-                  klass = frame->prev->last_class ? frame->prev->last_class : Qnil;
-                  if(TYPE(klass) == T_ICLASS) {
-                          klass = CLASS_OF(klass);
-                  }
-                  rb_ary_push(level, klass);
-                  rb_ary_push(level, ID2SYM(frame->prev->last_func));
-                  rb_ary_push(level, rb_str_new2(n->nd_file));
-                  rb_ary_push(level, INT2NUM(nd_line(n)));
-          }
-          else {
-                  level = rb_ary_new();
-                  rb_ary_push(level, Qnil);
-                  rb_ary_push(level, Qnil);
-                  rb_ary_push(level, rb_str_new2(n->nd_file));
-                  rb_ary_push(level, INT2NUM(nd_line(n)));
-          }
-          rb_ary_push(ary, level);
-          if(--lev == 0)
-                  break;
-  }
-
-  return ary;
-}
-  
-static void
-coverage_event_callsite_hook(rb_event_t event, NODE *node, VALUE self, 
-                ID mid, VALUE klass)
-{
- VALUE caller_ary;
- VALUE curr_meth;
- VALUE args[2];
- int status;
-
- caller_ary = callsite_custom_backtrace(caller_stack_len);
-
- if(TYPE(klass) == T_ICLASS) {
-         klass = CLASS_OF(klass);
- }
- curr_meth = rb_ary_new();
- rb_ary_push(curr_meth, klass);
- rb_ary_push(curr_meth, ID2SYM(mid));
-
- args[0] = caller_ary;
- args[1] = curr_meth;
- rb_protect(record_callsite_info, (VALUE)args, &status);
- if(!status && node) {
-         type_def_site args;        
-         
-         args.sourcefile = node->nd_file;
-         args.sourceline = nd_line(node) - 1;
-         args.curr_meth = curr_meth;
-         rb_protect(record_method_def_site, (VALUE)&args, NULL);
- }
- if(status)
-         rb_gv_set("$!", Qnil);
-}
-
-
-static VALUE
-cov_install_callsite_hook(VALUE self)
-{
-  if(!callsite_hook_set_p) {
-          if(TYPE(caller_info) != T_HASH)
-                  caller_info = rb_hash_new();
-          callsite_hook_set_p = 1;
-          rb_add_event_hook(coverage_event_callsite_hook, 
-                          RUBY_EVENT_CALL);
-          
-          return Qtrue;
-  } else
-          return Qfalse;
-}
-
-
-static VALUE
-cov_remove_callsite_hook(VALUE self)
-{
- if(!callsite_hook_set_p) 
-         return Qfalse;
- else {
-         rb_remove_event_hook(coverage_event_callsite_hook);
-         callsite_hook_set_p = 0;
-         return Qtrue;
- }
-}
-
-
-static VALUE
-cov_generate_callsite_info(VALUE self)
-{
-  VALUE ret;
-
-  ret = rb_ary_new();
-  rb_ary_push(ret, caller_info);
-  rb_ary_push(ret, method_def_site_info);
-  return ret;
-}
-
-
-static VALUE
-cov_reset_callsite(VALUE self)
-{
-  if(callsite_hook_set_p) {
-	  rb_raise(rb_eRuntimeError, 
-		  "Cannot reset the callsite info in the middle of a traced run.");
-	  return Qnil;
-  }
-
-  caller_info = rb_hash_new();
-  method_def_site_info = rb_hash_new();
-  return Qnil;
-}
 
 /* 
  *
@@ -272,10 +75,10 @@ coverage_mark_caller()
   for (; frame && (n = frame->node); frame = frame->prev) {
           if (frame->prev && frame->prev->last_func) {
                   if (frame->prev->node == n) continue;
-                  coverage_increase_counter_uncached(n->nd_file, nd_line(n), 1);
+                  coverage_increase_counter_uncached(n->nd_file, nd_line(n) - 1, 1);
           }
           else {
-                  coverage_increase_counter_uncached(n->nd_file, nd_line(n), 1);
+                  coverage_increase_counter_uncached(n->nd_file, nd_line(n) - 1, 1);
           }
           break;
   }
@@ -300,19 +103,56 @@ coverage_event_coverage_hook(rb_event_t event, NODE *node, VALUE self,
 {
  char *sourcefile;
  unsigned int sourceline;
+ static unsigned int in_hook = 0;
  
- if(event & (RUBY_EVENT_C_CALL | RUBY_EVENT_C_RETURN | RUBY_EVENT_CLASS))
+ if(in_hook) {
          return;
+ }
+
+ in_hook++;
+
+#if COVERAGE_DEBUG_EVENTS
+ do {
+         int status;
+         VALUE old_exception;
+         old_exception = rb_gv_get("$!");
+         rb_protect(rb_inspect, klass, &status);
+         if(!status) {
+                 printf("EVENT: %d %s %s %s %d\n", event,
+                                 klass ? RSTRING(rb_inspect(klass))->ptr : "", 
+                                 mid ? (mid == ID_ALLOCATOR ? "ID_ALLOCATOR" : rb_id2name(mid))
+                                 : "unknown",
+                                 node ? node->nd_file : "", node ? nd_line(node) : 0);
+         } else {
+                 printf("EVENT: %d %s %s %d\n", event,
+                                 mid ? (mid == ID_ALLOCATOR ? "ID_ALLOCATOR" : rb_id2name(mid)) 
+                                 : "unknown",
+                                 node ? node->nd_file : "", node ? nd_line(node) : 0);
+         }
+         rb_gv_set("$!", old_exception);
+ } while (0); 
+#endif
+
+ if(event & RUBY_EVENT_C_CALL) {
+         coverage_mark_caller();
+ }
+ if(event & (RUBY_EVENT_C_CALL | RUBY_EVENT_C_RETURN | RUBY_EVENT_CLASS)) {
+         in_hook--;
+         return;
+ }
  
- if(node == NULL)
+ if(node == NULL) {
+         in_hook--;
          return;
+ }
 
  sourcefile = node->nd_file;
  sourceline = nd_line(node) - 1;
 
  coverage_increase_counter_cached(sourcefile, sourceline);
- if(event == RUBY_EVENT_CALL)
+ if(event & RUBY_EVENT_CALL)
          coverage_mark_caller();
+ in_hook--;
 }
 
 
@@ -323,6 +163,8 @@ cov_install_coverage_hook(VALUE self)
 	  if(!coverinfo)
 		  coverinfo = st_init_strtable();
           coverage_hook_set_p = 1;
+          /* TODO: allow C_CALL too, since it's supported already
+           * the overhead is around ~30%, tested on typo */
           rb_add_event_hook(coverage_event_coverage_hook, 
                        RUBY_EVENT_ALL & ~RUBY_EVENT_C_CALL &
                        ~RUBY_EVENT_C_RETURN & ~RUBY_EVENT_CLASS);
@@ -461,27 +303,17 @@ Init_rcovrt()
          rb_const_set(rb_cObject, id_script_lines__, oSCRIPT_LINES__);
  }
 
- caller_info = rb_hash_new();
- method_def_site_info = rb_hash_new();
- rb_gc_register_address(&caller_info);
- rb_gc_register_address(&method_def_site_info);
-
  coverage_hook_set_p = 0;
 
  rb_define_singleton_method(mRCOV__, "install_coverage_hook", 
                  cov_install_coverage_hook, 0);
  rb_define_singleton_method(mRCOV__, "remove_coverage_hook", 
                  cov_remove_coverage_hook, 0);
- rb_define_singleton_method(mRCOV__, "install_callsite_hook", 
-                 cov_install_callsite_hook, 0);
- rb_define_singleton_method(mRCOV__, "remove_callsite_hook", 
-                 cov_remove_callsite_hook, 0);
  rb_define_singleton_method(mRCOV__, "generate_coverage_info", 
 		 cov_generate_coverage_info, 0);
- rb_define_singleton_method(mRCOV__, "generate_callsite_info", 
-		 cov_generate_callsite_info, 0);
  rb_define_singleton_method(mRCOV__, "reset_coverage", cov_reset_coverage, 0);
- rb_define_singleton_method(mRCOV__, "reset_callsite", cov_reset_callsite, 0);
  rb_define_singleton_method(mRCOV__, "ABI", cov_ABI, 0);
+
+ Init_rcov_callsite();
 }
 /* vim: set sw=8 expandtab: */

data/lib/rcov.rb

@@ -559,6 +559,7 @@ class CodeCoverageAnalyzer < DifferentialAnalyzer
   # Return an array with the names of the files whose code was executed inside
   # the block given to #run_hooked or between #install_hook and #remove_hook.
   def analyzed_files
+    update_script_lines__
     raw_data_relative.select do |file, lines|
       @script_lines__.has_key?(file)
     end.map{|fname,| fname}
@@ -581,6 +582,7 @@ class CodeCoverageAnalyzer < DifferentialAnalyzer
   # reset the data at any time with #reset to start from scratch.
   def data(filename)
     raw_data = raw_data_relative
+    update_script_lines__
     unless @script_lines__.has_key?(filename) && 
            raw_data.has_key?(filename)
       return nil 
@@ -611,6 +613,7 @@ class CodeCoverageAnalyzer < DifferentialAnalyzer
   def reset; super end
 
   def dump_coverage_info(formatters) # :nodoc:
+    update_script_lines__
     raw_data_relative.each do |file, lines|
       next if @script_lines__.has_key?(file) == false
       lines = @script_lines__[file]
@@ -690,19 +693,58 @@ class CodeCoverageAnalyzer < DifferentialAnalyzer
       ! different
     end
 
-    # FIXME find all prime factors, try them all
-    factors = (2..10).to_a.reverse
+    factors = braindead_factorize(line_info.size)
     factors.each do |n|
       if is_repeated[n]
         line_info = line_info[0, line_info.size / n]
         coverage_info = coverage_info[0, coverage_info.size / n]
         count_info = count_info[0, count_info.size / n]
       end
-    end
+    end if factors.size > 1   # don't even try if it's prime
     
     [line_info, coverage_info, count_info]
   end
 
+  def braindead_factorize(num)
+    return [0] if num == 0
+    return [-1] + braindead_factorize(-num) if num < 0
+    factors = []
+    while num % 2 == 0
+      factors << 2
+      num /= 2
+    end
+    size = num
+    n = 3
+    max = Math.sqrt(num)
+    while n <= max && n <= size
+      while size % n == 0
+        size /= n
+        factors << n
+      end
+      n += 2
+    end
+    factors << size if size != 1
+    factors
+  end
+
+  def update_script_lines__
+    @script_lines__ = @script_lines__.merge(SCRIPT_LINES__)
+  end
+
+  public
+  def marshal_dump # :nodoc:
+    # @script_lines__ is updated just before serialization so as to avoid
+    # missing files in SCRIPT_LINES__
+    ivs = {}
+    update_script_lines__
+    instance_variables.each{|iv| ivs[iv] = instance_variable_get(iv)}
+    ivs
+  end
+
+  def marshal_load(ivs) # :nodoc:
+    ivs.each_pair{|iv, val| instance_variable_set(iv, val)}
+  end
+
 end # CodeCoverageAnalyzer
 
 # A CallSiteAnalyzer can be used to obtain information about:

data/lib/rcov/rcovtask.rb

@@ -112,8 +112,8 @@ module Rcov
             else %!"#{rcov_path}"!
 	    end
           ruby_opts = @ruby_opts.clone
-          ruby_opts.push run_code
           ruby_opts.push( "-I#{lib_path}" )
+          ruby_opts.push run_code
 	  ruby_opts.push( "-w" ) if @warning
 	  ruby ruby_opts.join(" ") + " " + option_list +
             %[ -o "#{@output_dir}" ] +

data/lib/rcov/report.rb

@@ -4,8 +4,14 @@
 module Rcov
 
 class Formatter # :nodoc:
-    ignore_files = [/\A#{Regexp.escape(Config::CONFIG["libdir"])}/, /\btc_[^.]*.rb/,
-        /_test\.rb\z/, /\btest\//, /\bvendor\//, /\A#{Regexp.escape(__FILE__)}\z/]
+    require 'pathname'
+    ignore_files = [
+        /\A#{Regexp.escape(Pathname.new(Config::CONFIG["libdir"]).cleanpath.to_s)}/,
+        /\btc_[^.]*.rb/,
+        /_test\.rb\z/,
+        /\btest\//,
+        /\bvendor\//,
+        /\A#{Regexp.escape(__FILE__)}\z/]
     DEFAULT_OPTS = {:ignore => ignore_files, :sort => :name, :sort_reverse => false,
                     :output_threshold => 101, :dont_ignore => [], 
                     :callsite_analyzer => nil, :comments_run_by_default => false}

data/lib/rcov/version.rb

@@ -4,8 +4,8 @@
 
 module Rcov
 
-VERSION = "0.6.0"
-RELEASE_DATE = "2006-06-12"
+VERSION = "0.7.0"
+RELEASE_DATE = "2006/08/04"
 RCOVRT_ABI = [2,0,0]
 UPSTREAM_URL = "http://eigenclass.org/hiki.rb?rcov"
 

data/mingw-rbconfig.rb

@@ -7,8 +7,8 @@
 # mswin32 builds) is installed under $HOME/ruby-mingw32.
 
 module Config
-  RUBY_VERSION == "1.8.4" or
-    raise "ruby lib version (1.8.4) doesn't match executable version (#{RUBY_VERSION})"
+  #RUBY_VERSION == "1.8.5" or
+  #  raise "ruby lib version (1.8.5) doesn't match executable version (#{RUBY_VERSION})"
 
   TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.8/i386-mingw32")
   DESTDIR = '' unless defined? DESTDIR

data/rcov.vim

@@ -0,0 +1,38 @@
+" Vim compiler file
+" Language:	Ruby
+" Function:	Code coverage information with rcov
+" Maintainer:	Mauricio Fernandez <mfp at acm dot org>
+" Info:		
+" URL:		http://eigenclass.org/hiki.rb?rcov
+" ----------------------------------------------------------------------------
+"
+" Changelog:
+" 0.1:	initial version, shipped with rcov 0.6.0
+"
+" Comments:
+" Initial attempt. 
+" ----------------------------------------------------------------------------
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "rcov"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+CompilerSet makeprg=rake\ $*\ RCOVOPTS=\"-D\ --no-html\ --no-color\"\ $*
+
+CompilerSet errorformat=
+     \%+W\#\#\#\ %f:%l\,
+     \%-C\ \ \ ,
+     \%-C!!\ 
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8 ff=unix :

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: rcov
 version: !ruby/object:Gem::Version 
-  version: 0.6.0.1
-date: 2006-06-12 00:00:00 +02:00
+  version: 0.7.0.1
+date: 2006-08-04 00:00:00 +02:00
 summary: Code coverage analysis tool for Ruby
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Mauricio Fernandez
 files: 
@@ -36,7 +37,8 @@ files:
 - lib/rcov/rant.rb
 - lib/rcov/report.rb
 - ext/rcovrt/extconf.rb
-- ext/rcovrt/rcov.c
+- ext/rcovrt/rcovrt.c
+- ext/rcovrt/callsite.c
 - LEGAL
 - LICENSE
 - Rakefile
@@ -55,6 +57,7 @@ files:
 - test/turn_off_rcovrt.rb
 - test/test_CallSiteAnalyzer.rb
 - mingw-rbconfig.rb
+- rcov.vim
 - setup.rb
 - BLURB
 - CHANGES