unify time/memlimit opts with other ones; fix objspace req

Author: valich

bin/rdebug-ide

@@ -20,6 +20,9 @@ options = OpenStruct.new(
     'int_handler' => true,
     'dispatcher_port' => -1,
     'evaluation_timeout' => 10,
+    'trace_to_s' => false,
+    'debugger_memory_limit' => 10,
+    'inspect_time_limit' => 100,
     'rm_protocol_extensions' => false,
     'catchpoint_deleted_event' => false,
     'value_as_nested_element' => false,
@@ -45,19 +48,20 @@ EOB
   opts.on('--evaluation-timeout TIMEOUT', Integer,'evaluation timeout in seconds (default: 10)') do |timeout|
     options.evaluation_timeout = timeout
   end
-  Debugger.trace_to_s = false
-  opts.on("--evaluation-control", "trace to_s evaluation") do
-    Debugger.trace_to_s = true
-  end
+  opts.on("--evaluation-control", "trace to_s evaluation") {options.trace_to_s = true}
 
-  ENV['DEBUGGER_MEMORY_LIMIT'] = '10'
   opts.on("-m", "--memory-limit LIMIT", Integer, "evaluation memory limit in mb (default: 10)") do |limit|
-    ENV['DEBUGGER_MEMORY_LIMIT'] = limit.to_s
+    if defined?(JRUBY_VERSION) || RUBY_VERSION < '2.0'
+      $stderr.puts "Evaluation memory limit is ineffective in JRuby and MRI < 2.0"
+      limit = 0
+    end
+    options.debugger_memory_limit = limit
+    options.trace_to_s ||= limit > 0
   end
 
-  ENV['INSPECT_TIME_LIMIT'] = '100'
   opts.on("-t", "--time-limit LIMIT", Integer, "evaluation time limit in milliseconds (default: 100)") do |limit|
-    ENV['INSPECT_TIME_LIMIT'] = limit.to_s
+    options.inspect_time_limit = limit
+    options.trace_to_s ||= limit > 0
   end
 
   opts.on('--stop', 'stop when the script is loaded') {options.stop = true}
@@ -157,6 +161,9 @@ end
 Debugger.keep_frame_binding = options.frame_bind
 Debugger.tracing = options.tracing
 Debugger.evaluation_timeout = options.evaluation_timeout
+Debugger.trace_to_s = options.trace_to_s && (options.debugger_memory_limit > 0 || options.inspect_time_limit > 0)
+Debugger.debugger_memory_limit = options.debugger_memory_limit
+Debugger.inspect_time_limit = options.inspect_time_limit
 Debugger.catchpoint_deleted_event = options.catchpoint_deleted_event || options.rm_protocol_extensions
 Debugger.value_as_nested_element = options.value_as_nested_element || options.rm_protocol_extensions
 

lib/ruby-debug-ide.rb

@@ -44,7 +44,8 @@ def cleanup_backtrace(backtrace)
     end
 
     attr_accessor :attached
-    attr_accessor :cli_debug, :xml_debug, :evaluation_timeout, :trace_to_s
+    attr_accessor :cli_debug, :xml_debug, :evaluation_timeout
+    attr_accessor :trace_to_s, :debugger_memory_limit, :inspect_time_limit
     attr_accessor :control_thread
     attr_reader :interface
     # protocol extensions

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

@@ -17,7 +17,10 @@ def pre_child(options = nil)
             'int_handler' => true,
             'cli_debug'   => (ENV['DEBUGGER_CLI_DEBUG'] == 'true'),
             'notify_dispatcher' => true,
-            'evaluation_timeout' => 10
+            'evaluation_timeout' => 10,
+            'trace_to_s' => false,
+            'debugger_memory_limit' => 10,
+            'inspect_time_limit' => 100
         )
 
         if(options.ignore_port)
@@ -45,6 +48,9 @@ def start_debugger(options)
         Debugger.keep_frame_binding = options.frame_bind
         Debugger.tracing = options.tracing
         Debugger.evaluation_timeout = options.evaluation_timeout
+        Debugger.trace_to_s = options.trace_to_s
+        Debugger.debugger_memory_limit = options.debugger_memory_limit
+        Debugger.inspect_time_limit = options.inspect_time_limit
         Debugger.cli_debug = options.cli_debug
         Debugger.prepare_debugger(options)
       end

lib/ruby-debug-ide/xml_printer.rb

@@ -1,9 +1,6 @@
 require 'stringio'
 require 'cgi'
 require 'monitor'
-if (!defined?(JRUBY_VERSION))
-  include ObjectSpace
-end
 
 module Debugger
 
@@ -153,7 +150,7 @@ def print_hash(hash)
           if k.class.name == "String"
             name = '\'' + k + '\''
           else
-            name = exec_with_allocation_control(k, ENV['DEBUGGER_MEMORY_LIMIT'].to_i, ENV['INSPECT_TIME_LIMIT'].to_i, :to_s, OverflowMessageType::EXCEPTION_MESSAGE)
+            name = exec_with_allocation_control(k, Debugger.debugger_memory_limit, Debugger.inspect_time_limit, :to_s, OverflowMessageType::EXCEPTION_MESSAGE)
           end
           print_variable(name, hash[k], 'instance')
         }
@@ -189,18 +186,16 @@ def exec_with_timeout(sec, error_message)
     end
 
     def exec_with_allocation_control(value, memory_limit, time_limit, exec_method, overflow_message_type)
-      return value.send exec_method if !Debugger.trace_to_s
-      return exec_with_timeout(time_limit * 1e-3, "Timeout: evaluation of #{exec_method} took longer than #{time_limit}ms.") {value.send exec_method} if defined?(JRUBY_VERSION) || memory_limit <= 0 || (RUBY_VERSION < '2.0' && time_limit > 0)
+      return value.send exec_method unless Debugger.trace_to_s
 
+      if defined?(JRUBY_VERSION) || RUBY_VERSION < '2.0' || memory_limit <= 0
+        return exec_with_timeout(time_limit * 1e-3, "Timeout: evaluation of #{exec_method} took longer than #{time_limit}ms.") { value.send exec_method }
+      end
 
-      curr_thread = Thread.current
-      control_thread = Debugger.control_thread
-
-      result = nil
-
+      require 'objspace'
       trace_queue = Queue.new
 
-      inspect_thread = DebugThread.start do
+      DebugThread.start do
         start_alloc_size = ObjectSpace.memsize_of_all
         start_time = Time.now.to_f
 
@@ -263,7 +258,7 @@ def print_variable(name, value, kind)
       else
         has_children = !value.instance_variables.empty? || !value.class.class_variables.empty?
 
-        value_str = exec_with_allocation_control(value, ENV['DEBUGGER_MEMORY_LIMIT'].to_i, ENV['INSPECT_TIME_LIMIT'].to_i, :to_s, OverflowMessageType::EXCEPTION_MESSAGE) || 'nil' rescue "<#to_s method raised exception: #{$!}>"
+        value_str = exec_with_allocation_control(value, Debugger.debugger_memory_limit, Debugger.inspect_time_limit, :to_s, OverflowMessageType::EXCEPTION_MESSAGE) || 'nil' rescue "<#to_s method raised exception: #{$!}>"
         unless value_str.is_a?(String)
           value_str = "ERROR: #{value.class}.to_s method returns #{value_str.class}. Should return String."
         end
@@ -489,7 +484,7 @@ def max_compact_name_size
     def compact_array_str(value)
       slice = value[0..10]
 
-      compact = exec_with_allocation_control(slice, ENV['DEBUGGER_MEMORY_LIMIT'].to_i, ENV['INSPECT_TIME_LIMIT'].to_i, :inspect, OverflowMessageType::NIL_MESSAGE)
+      compact = exec_with_allocation_control(slice, Debugger.debugger_memory_limit, Debugger.inspect_time_limit, :inspect, OverflowMessageType::NIL_MESSAGE)
 
       if compact && value.size != slice.size
         compact[0..compact.size - 2] + ", ...]"
@@ -501,14 +496,14 @@ def compact_hash_str(value)
       keys_strings = Hash.new
 
       slice = value.sort_by do |k, _|
-        keys_string = exec_with_allocation_control(k, ENV['DEBUGGER_MEMORY_LIMIT'].to_i, ENV['INSPECT_TIME_LIMIT'].to_i, :to_s, OverflowMessageType::SPECIAL_SYMBOL_MESSAGE)
+        keys_string = exec_with_allocation_control(k, Debugger.debugger_memory_limit, Debugger.inspect_time_limit, :to_s, OverflowMessageType::SPECIAL_SYMBOL_MESSAGE)
         keys_strings[k] = keys_string
         keys_string
       end[0..5]
 
       compact = slice.map do |kv|
         key_string = keys_strings[kv[0]]
-        value_string = exec_with_allocation_control(kv[1], ENV['DEBUGGER_MEMORY_LIMIT'].to_i, ENV['INSPECT_TIME_LIMIT'].to_i, :to_s, OverflowMessageType::SPECIAL_SYMBOL_MESSAGE)
+        value_string = exec_with_allocation_control(kv[1], Debugger.debugger_memory_limit, Debugger.inspect_time_limit, :to_s, OverflowMessageType::SPECIAL_SYMBOL_MESSAGE)
         "#{key_string}: #{handle_binary_data(value_string)}"
       end.join(", ")
       "{" + compact + (slice.size != value.size ? ", ..." : "") + "}"