Skip to content

jruby and error class fix #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 8, 2017
Merged

jruby and error class fix #116

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fa26c9
jruby and error class fix
viuginick1 Aug 7, 2017
4702e96
Tabs for backtrace output
viuginick1 Aug 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions lib/ruby-debug-ide/xml_printer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
require 'stringio'
require 'cgi'
require 'monitor'
require 'objspace'
if (!defined?(JRUBY_VERSION))
require 'objspace'
end

module Debugger

Expand All @@ -15,7 +17,7 @@ class MemoryLimitError < StandardError
attr_reader :message
attr_reader :backtrace

def initialize(message, backtrace = '')
def initialize(message, backtrace = [])
@message = message
@backtrace = backtrace
end
Expand All @@ -25,7 +27,7 @@ class TimeLimitError < StandardError
attr_reader :message
attr_reader :backtrace

def initialize(message, backtrace = '')
def initialize(message, backtrace = [])
@message = message
@backtrace = backtrace
end
Expand Down Expand Up @@ -183,7 +185,7 @@ def exec_with_allocation_control(value, memory_limit, time_limit, exec_method, o
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.map {|l| "\t#{l}"}.join("\n")}")
curr_thread.raise TimeLimitError.new("Timeout: evaluation of #{exec_method} took longer than #{time_limit}ms.", caller.to_a)
inspect_thread.kill
end

Expand All @@ -192,7 +194,7 @@ def exec_with_allocation_control(value, memory_limit, time_limit, exec_method, o
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.map {|l| "\t#{l}"}.join("\n")}")
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
end
Expand All @@ -205,8 +207,7 @@ def exec_with_allocation_control(value, memory_limit, time_limit, exec_method, o
inspect_thread.kill
return result
rescue MemoryLimitError, TimeLimitError => e
print_debug(e.message + "\n" + e.backtrace)

print_debug(e.message + "\n" + e.backtrace.map{|l| "\t#{l}"}.join("\n"))
return overflow_message_type.call(e)
end

Expand All @@ -231,7 +232,6 @@ def print_variable(name, value, kind)
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: #{$!}>"

unless value_str.is_a?(String)
value_str = "ERROR: #{value.class}.to_s method returns #{value_str.class}. Should return String."
end
Expand Down