ruby-coverage 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9baa4046b7324aa14d7df67a9c32668c9e1c1a0c564abf495908eea750e5c356
-  data.tar.gz: 44c02aa89d8e75e75870b3bb2d38358e23c6fc020e556f47e04ef1552336126b
+  metadata.gz: 176a12a8f629c5fb15d2144517c36e947264e3685d4540efe4bf38e9f2f00a96
+  data.tar.gz: 1c4353f4bf6e204bb9cb2b0d2739936165475e2431c42d638c0890265ce772e3
 SHA512:
-  metadata.gz: 8401924f89670cfce2ead2b2fa8acdb19c1b19c9a24fe58011cce61ad91aa1c4abbb6b145641bd4d85bb3f88dcb970c58ce17ac6b037ba2974752f5965a20f22
-  data.tar.gz: 0c9abea17244e949fcb1aba1f694b830efce64ed3ed99e8f04ddd875e638afa32f98e90bc955a5a2a96d9c3618aa9e4d6c01114455d67453bc1cd3a862e42b20
+  metadata.gz: 809a55eda78a8aa6c5b019df4b29c1dab823634185354ed16c56d177c3ac38d140a886aeaf9837db901f2071fd76dbb3f0706a579621ce021af2afacbeb810a4
+  data.tar.gz: a1309ca0c777b427769821a05f3451652776fee93f8667f11492af70562b728e1509d9c5edf6a8c0e9457835d442cf13055cd3fb5d909c1abb3900b2b0829e0a

data/ext/ruby/coverage/tracer.c

@@ -169,8 +169,7 @@ static VALUE Ruby_Coverage_Tracer_initialize(VALUE self)
 static void Ruby_Coverage_Tracer_on_script_compiled(VALUE data, const rb_trace_arg_t *trace_arg)
 {
 	struct Ruby_Coverage_Tracer *tracer;
-	TypedData_Get_Struct(data, struct Ruby_Coverage_Tracer,
-	                     &Ruby_Coverage_Tracer_type, tracer);
+	TypedData_Get_Struct(data, struct Ruby_Coverage_Tracer, &Ruby_Coverage_Tracer_type, tracer);
 
 	tracer->last_path_pointer = 0;
 
@@ -223,43 +222,43 @@ static void Ruby_Coverage_Tracer_on_script_compiled(VALUE tpval, void *data)
 }
 #endif
 
-// Installed via rb_add_event_hook. Fires on every new source line.
+// Installed via rb_add_event_hook2 with RUBY_EVENT_HOOK_FLAG_RAW_ARG. Fires on
+// every new source line.
 //
-// Uses rb_sourcefile() pointer comparison as an O(1) same-file sentinel.
+// Uses rb_tracearg_path() pointer comparison as an O(1) same-file sentinel.
 // On first entry to a new file, checks if the script_compiled hook already
 // registered a counts array. If not (file was compiled before the tracer
 // started), falls back to rb_profile_frames to get the iseq and invokes the
 // user callback, matching the behaviour of the script_compiled path.
-static void Ruby_Coverage_Tracer_on_line(rb_event_flag_t event, VALUE data, VALUE self, ID method_id, VALUE klass)
+static void Ruby_Coverage_Tracer_on_line(VALUE data, const rb_trace_arg_t *trace_arg)
 {
 	struct Ruby_Coverage_Tracer *tracer;
 	TypedData_Get_Struct(data, struct Ruby_Coverage_Tracer, &Ruby_Coverage_Tracer_type, tracer);
 
 	if (tracer->in_callback) return;
 
-	uintptr_t current_path_pointer = (uintptr_t)rb_sourcefile();
+	VALUE path = rb_tracearg_path((rb_trace_arg_t *)trace_arg);
+	if (NIL_P(path)) return;
+
+	uintptr_t current_path_pointer = (uintptr_t)RSTRING_PTR(path);
 
 	if (tracer->last_path_pointer != current_path_pointer) {
 		tracer->last_path_pointer = current_path_pointer;
 
-		const char *path_cstr = rb_sourcefile();
 		VALUE counts = Qnil;
 
-		if (path_cstr) {
-			VALUE path = rb_str_new_cstr(path_cstr);
-			counts = rb_hash_lookup(tracer->counts, path);
+		counts = rb_hash_lookup(tracer->counts, path);
 
-			if (NIL_P(counts)) {
-				// File was compiled before the tracer started; inspect the current
-				// frame to recover the active instruction sequence.
-				VALUE iseq = Ruby_Coverage_Tracer_current_iseq();
+		if (NIL_P(counts)) {
+			// File was compiled before the tracer started; inspect the current
+			// frame to recover the active instruction sequence.
+			VALUE iseq = Ruby_Coverage_Tracer_current_iseq();
 
-				if (!NIL_P(iseq)) {
-					counts = Ruby_Coverage_Tracer_invoke_callback(tracer, path, iseq);
+			if (!NIL_P(iseq)) {
+				counts = Ruby_Coverage_Tracer_invoke_callback(tracer, path, iseq);
 
-					if (!NIL_P(counts)) {
-						rb_hash_aset(tracer->counts, path, counts);
-					}
+				if (!NIL_P(counts)) {
+					rb_hash_aset(tracer->counts, path, counts);
 				}
 			}
 		}
@@ -269,17 +268,27 @@ static void Ruby_Coverage_Tracer_on_line(rb_event_flag_t event, VALUE data, VALU
 
 	if (NIL_P(tracer->last_counts)) return;
 
-	int line = rb_sourceline();
+	int line = RB_NUM2INT(rb_tracearg_lineno((rb_trace_arg_t *)trace_arg));
 
 	// Counts are 1-indexed: index 0 is unused (nil), index N is the hit count
 	// for source line N. Grow the array if necessary.
-	while (RARRAY_LEN(tracer->last_counts) <= line) {
-		rb_ary_push(tracer->last_counts, Qnil);
+	if (RARRAY_LEN(tracer->last_counts) <= line) {
+		rb_ary_resize(tracer->last_counts, line + 1);
 	}
 
-	VALUE current = rb_ary_entry(tracer->last_counts, line);
-	rb_ary_store(tracer->last_counts, line,
-	             NIL_P(current) ? INT2FIX(1) : INT2FIX(FIX2INT(current) + 1));
+	VALUE *counts = RARRAY_PTR(tracer->last_counts);
+	VALUE current = counts[line];
+
+	// Store only immediate values through the raw array pointer. This avoids write-barrier issues; counters saturate at FIXNUM_MAX.
+	if (NIL_P(current)) {
+		counts[line] = RB_INT2FIX(1);
+	} else if (RB_FIXNUM_P(current)) {
+		long count = RB_FIX2LONG(current);
+
+		if (count < RUBY_FIXNUM_MAX) {
+			counts[line] = RB_LONG2FIX(count + 1);
+		}
+	}
 }
 
 static VALUE Ruby_Coverage_Tracer_start(VALUE self)
@@ -304,7 +313,12 @@ static VALUE Ruby_Coverage_Tracer_start(VALUE self)
 	rb_tracepoint_enable(tracer->script_compiled_tracepoint);
 	#endif
 
-	rb_add_event_hook(Ruby_Coverage_Tracer_on_line, RUBY_EVENT_LINE, self);
+	rb_add_event_hook2(
+		(rb_event_hook_func_t)Ruby_Coverage_Tracer_on_line,
+		RUBY_EVENT_LINE,
+		self,
+		RUBY_EVENT_HOOK_FLAG_SAFE | RUBY_EVENT_HOOK_FLAG_RAW_ARG
+	);
 
 	return self;
 }
@@ -322,7 +336,7 @@ static VALUE Ruby_Coverage_Tracer_stop(VALUE self)
 	}
 	#endif
 
-	rb_remove_event_hook_with_data(Ruby_Coverage_Tracer_on_line, self);
+	rb_remove_event_hook_with_data((rb_event_hook_func_t)Ruby_Coverage_Tracer_on_line, self);
 
 	tracer->last_path_pointer = 0;
 	RB_OBJ_WRITE(self, &tracer->last_counts, Qnil);

data/lib/ruby/coverage/version.rb

@@ -7,6 +7,6 @@
 module Ruby
 	# @namespace
 	module Coverage
-		VERSION = "0.0.2"
+		VERSION = "0.1.0"
 	end
 end

data/lib/ruby/coverage.rb

@@ -67,13 +67,7 @@ module Ruby
 				return self if @tracer
 				
 				@files  = {}
-				@tracer = Tracer.new do |path, iseq|
-					@files[path] ||= begin
-						counts = []
-						executable_lines(iseq).each{|line| counts[line] = 0}
-						counts
-					end
-				end
+				@tracer = Tracer.new(&method(:prepare_counts))
 				@tracer.start
 				
 				self
@@ -113,18 +107,22 @@ module Ruby
 				elsif clear
 					@tracer&.stop
 					@files  = {}
-					@tracer = Tracer.new do |path, iseq|
-						@files[path] ||= begin
-							counts = []
-							executable_lines(iseq).each{|line| counts[line] = 0}
-							counts
-						end
-					end
+					@tracer = Tracer.new(&method(:prepare_counts))
 					@tracer.start
 				end
 				
 				result
 			end
+			
+			private
+			
+			def prepare_counts(path, iseq)
+				@files[path] ||= begin
+					counts = []
+					executable_lines(iseq).each{|line| counts[line] = 0}
+					counts
+				end
+			end
 		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-coverage
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Samuel Williams