Skip to content

Revert "notify debugger about gdb_wrapper pid to kill it when debuggi… #156

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.

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
Jul 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions bin/gdb_wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,7 @@ unless options.ruby_path
exit 1
end

main_process_argv = ARGV
main_process_argv << '--gdb-wrapper-pid' << "#{Process.pid}"
argv = '["' + main_process_argv * '", "' + '"]'

argv = '["' + ARGV * '", "' + '"]'
child_argv = '["' + ARGV * '", "' + "', '--ignore-port" + '"]'
debugger_loader_path = File.expand_path(File.dirname(__FILE__)) + '/../lib/ruby-debug-ide/attach/debugger_loader'

Expand Down
4 changes: 0 additions & 4 deletions bin/rdebug-ide
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ options = OpenStruct.new(
'value_as_nested_element' => false,
'attach_mode' => false,
'cli_debug' => false,
'gdb_wrapper_pid' => nil,
'key_value_mode' => false
)

Expand All @@ -44,8 +43,6 @@ EOB

opts.on("-h", "--host HOST", "Host name used for remote debugging") {|host| options.host = host}
opts.on("-p", "--port PORT", Integer, "Port used for remote debugging") {|port| options.port = port}
opts.on("-gdbp", "--gdb-wrapper-pid PID", Integer, "Pid of corresponding gdb_wrapper (for attach case)") {|pid| options.gdb_wrapper_pid = pid}

opts.on("--dispatcher-port PORT", Integer, "Port used for multi-process debugging dispatcher") do |dp|
options.dispatcher_port = dp
end
Expand Down Expand Up @@ -176,7 +173,6 @@ Debugger.value_as_nested_element = options.value_as_nested_element || options.rm
Debugger.key_value_mode = options.key_value_mode

if options.attach_mode
at_exit {Process.kill('INT', options.gdb_wrapper_pid)} if options.gdb_wrapper_pid
if Debugger::FRONT_END == "debase"
Debugger.init_variables
end
Expand Down
2 changes: 1 addition & 1 deletion lib/ruby-debug-ide/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Debugger
IDE_VERSION='0.7.0.beta5'
IDE_VERSION='0.7.0.beta6'
end