ruby-debug-ide 0.6.1.beta7 → 0.6.1.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8f40891f590f541bc988442fa96447f2d48a087
-  data.tar.gz: e3df17736f12937eb3165686502a561232880a56
+  metadata.gz: a74a2dbac3d18cf49bd2358b17bec396e0f56132
+  data.tar.gz: 1320ff44faab25776a1fed25921687f029a395af
 SHA512:
-  metadata.gz: a21b87a270cfa68bf699ea727a1a8b1f96e1de5e6c719cedaae2f1419b5b01dedf9df5b440e6c2144bbfe1ae528f5456a9a768d0ef89ca40321992e9e679569e
-  data.tar.gz: 1db25d901d6f9b49475600c017132affec187df06d410b05d9330964c56f6cb13c613f94f89158f18833558a3c7ca1e4e332dfc2d5a6c2d7161c1e0a6c9a64d4
+  metadata.gz: 767971a4b4a68bcf4daa925e7bdfc09a78a531d47a6780ebd697adb727ea4f6d11175c0957b33739bbb284f207084686833ec9078a097c2d8c1c6fe400b6a600
+  data.tar.gz: 664dd472e6e8672e3fb4e1d71be8b5be9a4af3bab4011c1ea0d43dd668a11327015bfe83c3852f602c1ae3716fd3ae273d779f1536d271d03b8a1327cf0c9966

data/lib/ruby-debug-ide/attach/util.rb

@@ -1,6 +1,7 @@
 require 'ruby-debug-ide/attach/lldb'
 require 'ruby-debug-ide/attach/gdb'
 require 'socket'
+require 'set'
 
 def attach_and_return_thread(options, pid, debugger_loader_path, argv)
   Thread.new(argv) do |argv|
@@ -57,7 +58,7 @@ def get_child_pids(pid)
   q = Queue.new
   q.push(pid)
 
-  while (!q.empty?) do
+  until q.empty? do
     pid = q.pop
 
     pipe = IO.popen("pgrep -P #{pid}")
@@ -69,7 +70,25 @@ def get_child_pids(pid)
     end
   end
 
-  pids
+  filter_ruby_processes(pids)
+end
+
+def filter_ruby_processes(pids)
+  pipe = IO.popen(%Q(lsof -c ruby | awk '{print $2 ":" $9}' | grep -E 'bin/ruby([[:digit:]]+\.?)*$'))
+
+  ruby_processes = Set.new
+
+  pipe.readlines.each do |process|
+    pid = process.split(/:/).first
+    ruby_processes.add(pid.to_i)
+  end
+
+  ruby_processes_pids, non_ruby_processes_pids = pids.partition {|pid| ruby_processes.include? pid}
+
+  DebugPrinter.print_debug("The following child processes was added to attach: #{ruby_processes_pids.join(', ')}") unless ruby_processes_pids.empty?
+  DebugPrinter.print_debug("The following child are not ruby processes: #{non_ruby_processes_pids.join(', ')}") unless non_ruby_processes_pids.empty?
+
+  ruby_processes_pids
 end
 
 def command_exists(command)
@@ -93,4 +112,4 @@ def choose_debugger(ruby_path, pid, gems_to_include, debugger_loader_path, argv)
   end
 
   debugger
-end
+end

data/lib/ruby-debug-ide/command.rb

@@ -118,7 +118,7 @@ module Debugger
     def debug_eval(str, b = get_binding)
       begin
         str = str.to_s
-        str.force_encoding('UTF-8') if(RUBY_VERSION > '2.0')
+        str.force_encoding('UTF-8') if(RUBY_VERSION >= '2.0')
         to_inspect = Command.unescape_incoming(str)
         max_time = Debugger.evaluation_timeout
         @printer.print_debug("Evaluating %s with timeout after %i sec", str, max_time)

data/lib/ruby-debug-ide/multiprocess/pre_child.rb

@@ -16,7 +16,8 @@ module Debugger
             'tracing'     => false,
             'int_handler' => true,
             'cli_debug'   => (ENV['DEBUGGER_CLI_DEBUG'] == 'true'),
-            'notify_dispatcher' => true
+            'notify_dispatcher' => true,
+            'evaluation_timeout' => 10
         )
 
         if(options.ignore_port)
@@ -43,6 +44,7 @@ module Debugger
         # set options
         Debugger.keep_frame_binding = options.frame_bind
         Debugger.tracing = options.tracing
+        Debugger.evaluation_timeout = options.evaluation_timeout
         Debugger.cli_debug = options.cli_debug
         Debugger.prepare_debugger(options)
       end

data/lib/ruby-debug-ide/version.rb

@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.6.1.beta7'
+  IDE_VERSION='0.6.1.beta8'
 end

data/lib/ruby-debug-ide/xml_printer.rb

@@ -13,25 +13,21 @@ module Debugger
     SPECIAL_SYMBOL_MESSAGE = lambda {|e| '<?>'}
   end
 
-  class MemoryLimitError < StandardError
+  class ExecError < StandardError
     attr_reader :message
+    attr_reader :trace_point
     attr_reader :backtrace
 
-    def initialize(message, backtrace = [])
+    def initialize(message, trace_point, backtrace = [])
       @message = message
+      @trace_point = trace_point
       @backtrace = backtrace
     end
   end
 
-  class TimeLimitError < StandardError
-    attr_reader :message
-    attr_reader :backtrace
+  class MemoryLimitError < ExecError; end
 
-    def initialize(message, backtrace = [])
-      @message = message
-      @backtrace = backtrace
-    end
-  end
+  class TimeLimitError < ExecError; end
 
   class XmlPrinter # :nodoc:
     class ExceptionProxy
@@ -168,47 +164,47 @@ module Debugger
     end
 
     def exec_with_allocation_control(value, memory_limit, time_limit, exec_method, overflow_message_type)
-      check_memory_limit = true
-      if (defined?(JRUBY_VERSION) || ENV['DEBUGGER_MEMORY_LIMIT'].to_i <= 0)
-        check_memory_limit = false
-      end
+      return value.send exec_method if RUBY_VERSION < '2.0'
+
+      check_memory_limit = !defined?(JRUBY_VERSION) && ENV['DEBUGGER_MEMORY_LIMIT'].to_i > 0
       curr_thread = Thread.current
-      result = nil
-      inspect_thread = DebugThread.start {
 
-        start_alloc_size = ObjectSpace.memsize_of_all if (check_memory_limit)
+      result = nil
+      inspect_thread = DebugThread.start do
+        start_alloc_size = ObjectSpace.memsize_of_all if check_memory_limit
         start_time = Time.now.to_f
 
-        trace = TracePoint.new(:c_call, :call) do |tp|
+        trace_point = TracePoint.new(:c_call, :call) do | |
+          next unless Thread.current == inspect_thread
+          next unless rand > 0.75
 
-          if (rand > 0.75)
-            curr_time = Time.now.to_f
+          curr_time = Time.now.to_f
 
-            if ((curr_time - start_time) * 1e3 > time_limit)
-              curr_thread.raise TimeLimitError.new("Timeout: evaluation of #{exec_method} took longer than #{time_limit}ms.", caller.to_a)
-              inspect_thread.kill
-            end
+          if (curr_time - start_time) * 1e3 > time_limit
+            curr_thread.raise TimeLimitError.new("Timeout: evaluation of #{exec_method} took longer than #{time_limit}ms.", trace_point, caller.to_a)
+          end
 
-            if (check_memory_limit)
-              curr_alloc_size = ObjectSpace.memsize_of_all
-              start_alloc_size = curr_alloc_size if (curr_alloc_size < start_alloc_size)
+          if check_memory_limit
+            curr_alloc_size = ObjectSpace.memsize_of_all
+            start_alloc_size = curr_alloc_size if curr_alloc_size < start_alloc_size
 
-              if (curr_alloc_size - start_alloc_size > 1e6 * memory_limit)
-                curr_thread.raise MemoryLimitError.new("Out of memory: evaluation of #{exec_method} took more than #{memory_limit}mb.", caller.to_a)
-                inspect_thread.kill
-              end
+            if curr_alloc_size - start_alloc_size > 1e6 * memory_limit
+              curr_thread.raise MemoryLimitError.new("Out of memory: evaluation of #{exec_method} took more than #{memory_limit}mb.", trace_point, caller.to_a)
             end
           end
-        end.enable {
-          result = value.send exec_method
-        }
-      }
+        end
+        trace_point.enable
+        result = value.send exec_method
+        trace_point.disable
+      end
       inspect_thread.join
-      inspect_thread.kill
       return result
-    rescue MemoryLimitError, TimeLimitError => e
-      print_debug(e.message + "\n" + e.backtrace.map{|l| "\t#{l}"}.join("\n"))
+    rescue ExecError => e
+      e.trace_point.disable
+      print_debug(e.message + "\n" + e.backtrace.map {|l| "\t#{l}"}.join("\n"))
       return overflow_message_type.call(e)
+    ensure
+      inspect_thread.kill if inspect_thread && inspect_thread.alive?
     end
 
     def print_variable(name, value, kind)
@@ -512,4 +508,4 @@ module Debugger
 
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version
-  version: 0.6.1.beta7
+  version: 0.6.1.beta8
 platform: ruby
 authors:
 - Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake