readapt 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c60f531994db02e3c7592e83854acd4ed407c72fb8cea7d917bd22a47a7e0d37
-  data.tar.gz: 427826613e80cd2ede776dd58a4ec84aee7be8a0a507dcd1da51dac78c2035e1
+  metadata.gz: 540b9c4c18bdbd634b6db72f49fa456dc306f41f139f966770795f89850a130a
+  data.tar.gz: c0ebaf5c647ddb1c794904928902da3f8bed362562d631c25badf89acbebaef1
 SHA512:
-  metadata.gz: 4dc1eb602525d5dff1b8ad38254285eed0c52b48c9e996164ad8f54cf525c7f6097872f835e61aee622ae203ec4bc611bb2965dc87866b07ca736ec7c42614da
-  data.tar.gz: b0f4250aacaf718351ceabe475c73ae923b0373392247733960c61d577cf042b95084985cfe36c2412d47e96a2b732eabb601e862d9c61268a20e33005b295a3
+  metadata.gz: b6da35b56e5244c2f3e1071ca3899f790edbfd78291d2756f1a5b0c1ab22e746ac1e83e20ec8f899eaf6fe77a408d671f5a838c2b68fda3d4798ab10ac7b0e6a
+  data.tar.gz: 6a97d5f44f5b866e3b68a78a804b52ed90b2114204f9db180fe3fe7fbe49ccbb3d08567ccdd4783e565acdb0278b195fdd0676d9193c0e59b8cd73d3578a74f2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.6.2 - September 10, 2019
+- Monitor processes all new threads
+- Discard buggy output redirection
+
 # 0.6.1 - September 7, 2019
 - Ignore nilable paths in thread events
 

data/ext/readapt/monitor.c

@@ -86,52 +86,49 @@ process_line_event(VALUE tracepoint, void *data)
 	if (ref != Qnil)
 	{
 		ptr = thread_reference_pointer(ref);
-		if (ptr->depth > 0)
+		threadPaused = (ptr->control == id_pause);
+		if (firstLineEvent && ptr->control == id_continue && breakpoints_files() == 0)
 		{
-			threadPaused = (ptr->control == id_pause);
-			if (firstLineEvent && ptr->control == id_continue && breakpoints_files() == 0)
-			{
-				return;
-			}
-			tp = rb_tracearg_from_tracepoint(tracepoint);
-			tmp = rb_tracearg_path(tp);
-			tp_file = normalize_path_new_cstr(StringValueCStr(tmp));
-			tp_line = NUM2LONG(rb_tracearg_lineno(tp));
-
-			dapEvent = id_continue;
-			if (!firstLineEvent)
-			{
-				if (strcmp(tp_file, entryFile) == 0)
-				{
-					firstLineEvent = 1;
-					ptr->control = rb_intern("entry");
-					process_line_event(tracepoint, data);
-				}
-			}
-			else if (threadPaused)
-			{
-				dapEvent = id_pause;
-			}
-			else if (match_step(ptr))
-			{
-				dapEvent = rb_intern("step");
-			}
-			else if (breakpoints_match(tp_file, tp_line))
-			{
-				dapEvent = rb_intern("breakpoint");
-			}
-			else if (ptr->control == id_entry)
-			{
-				dapEvent = id_entry;
-			}
+			return;
+		}
+		tp = rb_tracearg_from_tracepoint(tracepoint);
+		tmp = rb_tracearg_path(tp);
+		tp_file = normalize_path_new_cstr(StringValueCStr(tmp));
+		tp_line = NUM2LONG(rb_tracearg_lineno(tp));
 
-			if (dapEvent != id_continue)
+		dapEvent = id_continue;
+		if (!firstLineEvent)
+		{
+			if (strcmp(tp_file, entryFile) == 0)
 			{
-				monitor_debug(tp_file, tp_line, tracepoint, ptr, dapEvent);
+				firstLineEvent = 1;
+				ptr->control = rb_intern("entry");
+				process_line_event(tracepoint, data);
 			}
+		}
+		else if (threadPaused)
+		{
+			dapEvent = id_pause;
+		}
+		else if (match_step(ptr))
+		{
+			dapEvent = rb_intern("step");
+		}
+		else if (breakpoints_match(tp_file, tp_line))
+		{
+			dapEvent = rb_intern("breakpoint");
+		}
+		else if (ptr->control == id_entry)
+		{
+			dapEvent = id_entry;
+		}
 
-			free(tp_file);
+		if (dapEvent != id_continue)
+		{
+			monitor_debug(tp_file, tp_line, tracepoint, ptr, dapEvent);
 		}
+
+		free(tp_file);
 	}
 }
 
@@ -173,23 +170,15 @@ process_thread_begin_event(VALUE tracepoint, void *data)
 	here = rb_ary_pop(list);
 	if (here != Qnil)
 	{
-		prev = rb_ary_pop(list);
-		if (prev != Qnil)
-		{
-			ref = thread_reference(prev);
-			if (ref != Qnil)
-			{
-				ref = thread_add_reference(here);
-				ptr = thread_reference_pointer(ref);
-				monitor_debug(
-					"",
-					0,
-					tracepoint,
-					ptr,
-					rb_intern("thread_begin")
-				);
-			}
-		}
+		ref = thread_add_reference(here);
+		ptr = thread_reference_pointer(ref);
+		monitor_debug(
+			"",
+			0,
+			tracepoint,
+			ptr,
+			rb_intern("thread_begin")
+		);
 	}
 }
 

data/lib/readapt/debugger.rb

@@ -105,16 +105,16 @@ module Readapt
     # @param [Snapshot]
     # return [void]
     def debug snapshot
-      if (snapshot.event == :thread_begin)
-        thr = Thread.new(snapshot.thread_id)
+      if snapshot.event == :thread_begin || snapshot.event == :entry
+        @threads[snapshot.thread_id] ||= Thread.new(snapshot.thread_id)
+        thr = @threads[snapshot.thread_id]
         thr.control = :continue
-        @threads[snapshot.thread_id] = thr
         send_event('thread', {
           reason: 'started',
           threadId: snapshot.thread_id
         }, true)
         snapshot.control = :continue
-      elsif (snapshot.event == :thread_end)
+      elsif snapshot.event == :thread_end
         thr = thread(snapshot.thread_id)
         thr.control = :continue
         @threads.delete snapshot.thread_id
@@ -123,8 +123,8 @@ module Readapt
           threadId: snapshot.thread_id
         })
         snapshot.control = :continue
-      elsif snapshot.event == :entry
-        snapshot.control = :continue
+      # elsif snapshot.event == :entry
+      #   snapshot.control = :continue
       else
         changed
         thread = self.thread(snapshot.thread_id)

data/lib/readapt/shell.rb

@@ -28,18 +28,6 @@ module Readapt
         Readapt::Adapter.host debugger
         machine.prepare Backport::Server::Tcpip.new(host: options[:host], port: options[:port], adapter: Readapt::Adapter)
         STDERR.puts "Readapt Debugger #{Readapt::VERSION} is listening HOST=#{options[:host]} PORT=#{options[:port]} PID=#{Process.pid}"
-        # Redirect STDOUT and STDERR through the adapter protocol
-        # @todo This feature does not always work with STDERR, e.g, when
-        #   running RSpec
-        cats = ['stdout', 'stderr']
-        [STDOUT, STDERR].each do |io|
-          cat = cats.shift
-          io.instance_eval do
-            define_singleton_method :write do |*args, &block|
-              debugger.output args.join, cat
-            end
-          end
-        end
       end
     end
   end

data/lib/readapt/version.rb

@@ -1,3 +1,3 @@
 module Readapt
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: readapt
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-07 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport