f6ac5f3d63
I.e., use C++ virtual methods and inheritance instead of tables of
function pointers.
Unfortunately, there's no way to do a smooth transition. ALL native
targets in the tree must be converted at the same time. I've tested
all I could with cross compilers and with help from GCC compile farm,
but naturally I haven't been able to test many of the ports. Still, I
made a best effort to port everything over, and while I expect some
build problems due to typos and such, which should be trivial to fix,
I don't expect any design problems.
* Implementation notes:
- The flattened current_target is gone. References to current_target
or current_target.beneath are replaced with references to
target_stack (the top of the stack) directly.
- To keep "set debug target" working, this adds a new debug_stratum
layer that sits on top of the stack, prints the debug, and delegates
to the target beneath.
In addition, this makes the shortname and longname properties of
target_ops be virtual methods instead of data fields, and makes the
debug target defer those to the target beneath. This is so that
debug code sprinkled around that does "if (debugtarget) ..." can
transparently print the name of the target beneath.
A patch later in the series actually splits out the
shortname/longname methods to a separate structure, but I preferred
to keep that chance separate as it is associated with changing a bit
the design of how targets are registered and open.
- Since you can't check whether a C++ virtual method is overridden,
the old method of checking whether a target_ops implements a method
by comparing the function pointer must be replaced with something
else.
Some cases are fixed by adding a parallel "can_do_foo" target_ops
methods. E.g.,:
+ for (t = target_stack; t != NULL; t = t->beneath)
{
- if (t->to_create_inferior != NULL)
+ if (t->can_create_inferior ())
break;
}
Others are fixed by changing void return type to bool or int return
type, and have the default implementation return false or -1, to
indicate lack of support.
- make-target-delegates was adjusted to generate C++ classes and
methods.
It needed tweaks to grok "virtual" in front of the target method
name, and for the fact that methods are no longer function pointers.
(In particular, the current code parsing the return type was simple
because it could simply parse up until the '(' in '(*to_foo)'.
It now generates a couple C++ classes that inherit target_ops:
dummy_target and debug_target.
Since we need to generate the class declarations as well, i.e., we
need to emit methods twice, we now generate the code in two passes.
- The core_target global is renamed to avoid conflict with the
"core_target" class.
- ctf/tfile targets
init_tracefile_ops is replaced by a base class that is inherited by
both ctf and tfile.
- bsd-uthread
The bsd_uthread_ops_hack hack is gone. It's not needed because
nothing was extending a target created by bsd_uthread_target.
- remote/extended-remote targets
This is a first pass, just enough to C++ify target_ops.
A later pass will convert more free functions to methods, and make
remote_state be truly per remote instance, allowing multiple
simultaneous instances of remote targets.
- inf-child/"native" is converted to an actual base class
(inf_child_target), that is inherited by all native targets.
- GNU/Linux
The old weird double-target linux_ops mechanism in linux-nat.c, is
gone, replaced by adding a few virtual methods to linux-nat.h's
target_ops, called low_XXX, that the concrete linux-nat
implementations override. Sort of like gdbserver's
linux_target_ops, but simpler, for requiring only one
target_ops-like hierarchy, which spares implementing the same method
twice when we need to forward the method to a low implementation.
The low target simply reimplements the target_ops method directly in
that case.
There are a few remaining linux-nat.c hooks that would be better
converted to low_ methods like above too. E.g.:
linux_nat_set_new_thread (t, x86_linux_new_thread);
linux_nat_set_new_fork (t, x86_linux_new_fork);
linux_nat_set_forget_process
That'll be done in a follow up patch.
- We can no longer use functions like x86_use_watchpoints to install
custom methods on an arbitrary base target.
The patch replaces instances of such a pattern with template mixins.
For example memory_breakpoint_target defined in target.h, or
x86_nat_target in x86-nat.h.
- linux_trad_target, MIPS and Alpha GNU/Linux
The code in the new linux-nat-trad.h/c files which was split off of
inf-ptrace.h/c recently, is converted to a C++ base class, and used
by the MIPS and Alpha GNU/Linux ports.
- BSD targets
The
$architecture x NetBSD/OpenBSD/FreeBSD
support matrix complicates things a bit. There's common BSD target
code, and there's common architecture-specific code shared between
the different BSDs. Currently, all that is stiched together to form
a final target, via the i386bsd_target, x86bsd_target,
fbsd_nat_add_target functions etc.
This introduces new fbsd_nat_target, obsd_nat_target and
nbsd_nat_target classes that serve as base/prototype target for the
corresponding BSD variant.
And introduces generic i386/AMD64 BSD targets, to be used as
template mixin to build a final target. Similarly, a generic SPARC
target is added, used by both BSD and Linux ports.
- bsd_kvm_add_target, BSD libkvm target
I considered making bsd_kvm_supply_pcb a virtual method, and then
have each port inherit bsd_kvm_target and override that method, but
that was resulting in lots of unjustified churn, so I left the
function pointer mechanism alone.
gdb/ChangeLog:
2018-05-02 Pedro Alves <palves@redhat.com>
John Baldwin <jhb@freebsd.org>
* target.h (enum strata) <debug_stratum>: New.
(struct target_ops) <all delegation methods>: Replace by C++
virtual methods, and drop "to_" prefix. All references updated
throughout.
<to_shortname, to_longname, to_doc, to_data,
to_have_steppable_watchpoint, to_have_continuable_watchpoint,
to_has_thread_control, to_attach_no_wait>: Delete, replaced by
virtual methods. All references updated throughout.
<can_attach, supports_terminal_ours, can_create_inferior,
get_thread_control_capabilities, attach_no_wait>: New
virtual methods.
<insert_breakpoint, remove_breakpoint>: Now
TARGET_DEFAULT_NORETURN methods.
<info_proc>: Now returns bool.
<to_magic>: Delete.
(OPS_MAGIC): Delete.
(current_target): Delete. All references replaced by references
to ...
(target_stack): ... this. New.
(target_shortname, target_longname): Adjust.
(target_can_run): Now a function declaration.
(default_child_has_all_memory, default_child_has_memory)
(default_child_has_stack, default_child_has_registers)
(default_child_has_execution): Remove target_ops parameter.
(complete_target_initialization): Delete.
(memory_breakpoint_target): New template class.
(test_target_ops): Refactor as a C++ class with virtual methods.
* make-target-delegates (NAME_PART): Tighten.
(POINTER_PART, CP_SYMBOL): New.
(SIMPLE_RETURN_PART): Reimplement.
(VEC_RETURN_PART): Expect less.
(RETURN_PART, VIRTUAL_PART): New.
(METHOD): Adjust to C++ virtual methods.
(scan_target_h): Remove reference to C99.
(dname): Output "target_ops::" prefix.
(write_function_header): Adjust to output a C++ class method.
(write_declaration): New.
(write_delegator): Adjust to output a C++ class method.
(tdname): Output "dummy_target::" prefix.
(write_tdefault, write_debugmethod): Adjust to output a C++ class
method.
(tdefault_names, debug_names): Delete.
(return_types, tdefaults, styles, argtypes_array): New.
(top level): All methods are delegators.
(print_class): New.
(top level): Print dummy_target and debug_target classes.
* target-delegates.c: Regenerate.
* target-debug.h (target_debug_print_enum_info_proc_what)
(target_debug_print_thread_control_capabilities)
(target_debug_print_thread_info_p): New.
* target.c (dummy_target): Delete.
(the_dummy_target, the_debug_target): New.
(target_stack): Now extern.
(set_targetdebug): Push/unpush debug target.
(default_child_has_all_memory, default_child_has_memory)
(default_child_has_stack, default_child_has_registers)
(default_child_has_execution): Remove target_ops parameter.
(complete_target_initialization): Delete.
(add_target_with_completer): No longer call
complete_target_initialization.
(target_supports_terminal_ours): Use regular delegation.
(update_current_target): Delete.
(push_target): No longer check magic number. Don't call
update_current_target.
(unpush_target): Don't call update_current_target.
(target_is_pushed): No longer check magic number.
(target_require_runnable): Skip for all stratums over
process_stratum.
(target_ops::info_proc): New.
(target_info_proc): Use find_target_at and
find_default_run_target.
(target_supports_disable_randomization): Use regular delegation.
(target_get_osdata): Use find_target_at.
(target_ops::open, target_ops::close, target_ops::can_attach)
(target_ops::attach, target_ops::can_create_inferior)
(target_ops::create_inferior, target_ops::can_run)
(target_can_run): New.
(default_fileio_target): Use regular delegation.
(target_ops::fileio_open, target_ops::fileio_pwrite)
(target_ops::fileio_pread, target_ops::fileio_fstat)
(target_ops::fileio_close, target_ops::fileio_unlink)
(target_ops::fileio_readlink): New.
(target_fileio_open_1, target_fileio_unlink)
(target_fileio_readlink): Always call the target method. Handle
FILEIO_ENOSYS.
(return_zero, return_zero_has_execution): Delete.
(init_dummy_target): Delete.
(dummy_target::dummy_target, dummy_target::shortname)
(dummy_target::longname, dummy_target::doc)
(debug_target::debug_target, debug_target::shortname)
(debug_target::longname, debug_target::doc): New.
(target_supports_delete_record): Use regular delegation.
(setup_target_debug): Delete.
(maintenance_print_target_stack): Skip debug_stratum.
(initialize_targets): Instantiate the_dummy_target and
the_debug_target.
* auxv.c (target_auxv_parse): Remove 'ops' parameter. Adjust to
use target_stack.
(target_auxv_search, fprint_target_auxv): Adjust.
(info_auxv_command): Adjust to use target_stack.
* auxv.h (target_auxv_parse): Remove 'ops' parameter.
* exceptions.c (print_flush): Handle a NULL target_stack.
* regcache.c (target_ops_no_register): Refactor as class with
virtual methods.
* exec.c (exec_target): New class.
(exec_ops): Now an exec_target.
(exec_open, exec_close_1, exec_get_section_table)
(exec_xfer_partial, exec_files_info, exec_has_memory)
(exec_make_note_section): Refactor as exec_target methods.
(exec_file_clear, ignore, exec_remove_breakpoint, init_exec_ops):
Delete.
(exec_target::find_memory_regions): New.
(_initialize_exec): Don't call init_exec_ops.
* gdbcore.h (exec_file_clear): Delete.
* corefile.c (core_target): Delete.
(core_file_command): Adjust.
* corelow.c (core_target): New class.
(the_core_target): New.
(core_close): Remove target_ops parameter.
(core_close_cleanup): Adjust.
(core_target::close): New.
(core_open, core_detach, get_core_registers, core_files_info)
(core_xfer_partial, core_thread_alive, core_read_description)
(core_pid_to_str, core_thread_name, core_has_memory)
(core_has_stack, core_has_registers, core_info_proc): Rework as
core_target methods.
(ignore, core_remove_breakpoint, init_core_ops): Delete.
(_initialize_corelow): Initialize the_core_target.
* gdbcore.h (core_target): Delete.
(the_core_target): New.
* ctf.c: (ctf_target): New class.
(ctf_ops): Now a ctf_target.
(ctf_open, ctf_close, ctf_files_info, ctf_fetch_registers)
(ctf_xfer_partial, ctf_get_trace_state_variable_value)
(ctf_trace_find, ctf_traceframe_info): Refactor as ctf_target
methods.
(init_ctf_ops): Delete.
(_initialize_ctf): Don't call it.
* tracefile-tfile.c (tfile_target): New class.
(tfile_ops): Now a tfile_target.
(tfile_open, tfile_close, tfile_files_info)
(tfile_get_tracepoint_status, tfile_trace_find)
(tfile_fetch_registers, tfile_xfer_partial)
(tfile_get_trace_state_variable_value, tfile_traceframe_info):
Refactor as tfile_target methods.
(tfile_xfer_partial_features): Remove target_ops parameter.
(init_tfile_ops): Delete.
(_initialize_tracefile_tfile): Don't call it.
* tracefile.c (tracefile_has_all_memory, tracefile_has_memory)
(tracefile_has_stack, tracefile_has_registers)
(tracefile_thread_alive, tracefile_get_trace_status): Refactor as
tracefile_target methods.
(init_tracefile_ops): Delete.
(tracefile_target::tracefile_target): New.
* tracefile.h: Include "target.h".
(tracefile_target): New class.
(init_tracefile_ops): Delete.
* spu-multiarch.c (spu_multiarch_target): New class.
(spu_ops): Now a spu_multiarch_target.
(spu_thread_architecture, spu_region_ok_for_hw_watchpoint)
(spu_fetch_registers, spu_store_registers, spu_xfer_partial)
(spu_search_memory, spu_mourn_inferior): Refactor as
spu_multiarch_target methods.
(init_spu_ops): Delete.
(_initialize_spu_multiarch): Remove references to init_spu_ops,
complete_target_initialization.
* ravenscar-thread.c (ravenscar_thread_target): New class.
(ravenscar_ops): Now a ravenscar_thread_target.
(ravenscar_resume, ravenscar_wait, ravenscar_update_thread_list)
(ravenscar_thread_alive, ravenscar_pid_to_str)
(ravenscar_fetch_registers, ravenscar_store_registers)
(ravenscar_prepare_to_store, ravenscar_stopped_by_sw_breakpoint)
(ravenscar_stopped_by_hw_breakpoint)
(ravenscar_stopped_by_watchpoint, ravenscar_stopped_data_address)
(ravenscar_mourn_inferior, ravenscar_core_of_thread)
(ravenscar_get_ada_task_ptid): Refactor as ravenscar_thread_target
methods.
(init_ravenscar_thread_ops): Delete.
(_initialize_ravenscar): Remove references to
init_ravenscar_thread_ops and complete_target_initialization.
* bsd-uthread.c (bsd_uthread_ops_hack): Delete.
(bsd_uthread_target): New class.
(bsd_uthread_ops): Now a bsd_uthread_target.
(bsd_uthread_activate): Adjust to refer to bsd_uthread_ops.
(bsd_uthread_close, bsd_uthread_mourn_inferior)
(bsd_uthread_fetch_registers, bsd_uthread_store_registers)
(bsd_uthread_wait, bsd_uthread_resume, bsd_uthread_thread_alive)
(bsd_uthread_update_thread_list, bsd_uthread_extra_thread_info)
(bsd_uthread_pid_to_str): Refactor as bsd_uthread_target methods.
(bsd_uthread_target): Delete function.
(_initialize_bsd_uthread): Remove reference to
complete_target_initialization.
* bfd-target.c (target_bfd_data): Delete. Fields folded into ...
(target_bfd): ... this new class.
(target_bfd_xfer_partial, target_bfd_get_section_table)
(target_bfd_close): Refactor as target_bfd methods.
(target_bfd::~target_bfd): New.
(target_bfd_reopen): Adjust.
(target_bfd::close): New.
* record-btrace.c (record_btrace_target): New class.
(record_btrace_ops): Now a record_btrace_target.
(record_btrace_open, record_btrace_stop_recording)
(record_btrace_disconnect, record_btrace_close)
(record_btrace_async, record_btrace_info)
(record_btrace_insn_history, record_btrace_insn_history_range)
(record_btrace_insn_history_from, record_btrace_call_history)
(record_btrace_call_history_range)
(record_btrace_call_history_from, record_btrace_record_method)
(record_btrace_is_replaying, record_btrace_will_replay)
(record_btrace_xfer_partial, record_btrace_insert_breakpoint)
(record_btrace_remove_breakpoint, record_btrace_fetch_registers)
(record_btrace_store_registers, record_btrace_prepare_to_store)
(record_btrace_to_get_unwinder)
(record_btrace_to_get_tailcall_unwinder, record_btrace_resume)
(record_btrace_commit_resume, record_btrace_wait)
(record_btrace_stop, record_btrace_can_execute_reverse)
(record_btrace_stopped_by_sw_breakpoint)
(record_btrace_supports_stopped_by_sw_breakpoint)
(record_btrace_stopped_by_hw_breakpoint)
(record_btrace_supports_stopped_by_hw_breakpoint)
(record_btrace_update_thread_list, record_btrace_thread_alive)
(record_btrace_goto_begin, record_btrace_goto_end)
(record_btrace_goto, record_btrace_stop_replaying_all)
(record_btrace_execution_direction)
(record_btrace_prepare_to_generate_core)
(record_btrace_done_generating_core): Refactor as
record_btrace_target methods.
(init_record_btrace_ops): Delete.
(_initialize_record_btrace): Remove reference to
init_record_btrace_ops.
* record-full.c (RECORD_FULL_IS_REPLAY): Adjust to always refer to
the execution_direction global.
(record_full_base_target, record_full_target)
(record_full_core_target): New classes.
(record_full_ops): Now a record_full_target.
(record_full_core_ops): Now a record_full_core_target.
(record_full_target::detach, record_full_target::disconnect)
(record_full_core_target::disconnect)
(record_full_target::mourn_inferior, record_full_target::kill):
New.
(record_full_open, record_full_close, record_full_async): Refactor
as methods of the record_full_base_target class.
(record_full_resume, record_full_commit_resume): Refactor
as methods of the record_full_target class.
(record_full_wait, record_full_stopped_by_watchpoint)
(record_full_stopped_data_address)
(record_full_stopped_by_sw_breakpoint)
(record_full_supports_stopped_by_sw_breakpoint)
(record_full_stopped_by_hw_breakpoint)
(record_full_supports_stopped_by_hw_breakpoint): Refactor as
methods of the record_full_base_target class.
(record_full_store_registers, record_full_xfer_partial)
(record_full_insert_breakpoint, record_full_remove_breakpoint):
Refactor as methods of the record_full_target class.
(record_full_can_execute_reverse, record_full_get_bookmark)
(record_full_goto_bookmark, record_full_execution_direction)
(record_full_record_method, record_full_info, record_full_delete)
(record_full_is_replaying, record_full_will_replay)
(record_full_goto_begin, record_full_goto_end, record_full_goto)
(record_full_stop_replaying): Refactor as methods of the
record_full_base_target class.
(record_full_core_resume, record_full_core_kill)
(record_full_core_fetch_registers)
(record_full_core_prepare_to_store)
(record_full_core_store_registers, record_full_core_xfer_partial)
(record_full_core_insert_breakpoint)
(record_full_core_remove_breakpoint)
(record_full_core_has_execution): Refactor
as methods of the record_full_core_target class.
(record_full_base_target::supports_delete_record): New.
(init_record_full_ops): Delete.
(init_record_full_core_ops): Delete.
(record_full_save): Refactor as method of the
record_full_base_target class.
(_initialize_record_full): Remove references to
init_record_full_ops and init_record_full_core_ops.
* remote.c (remote_target, extended_remote_target): New classes.
(remote_ops): Now a remote_target.
(extended_remote_ops): Now an extended_remote_target.
(remote_insert_fork_catchpoint, remote_remove_fork_catchpoint)
(remote_insert_vfork_catchpoint, remote_remove_vfork_catchpoint)
(remote_insert_exec_catchpoint, remote_remove_exec_catchpoint)
(remote_pass_signals, remote_set_syscall_catchpoint)
(remote_program_signals, )
(remote_thread_always_alive): Remove target_ops parameter.
(remote_thread_alive, remote_thread_name)
(remote_update_thread_list, remote_threads_extra_info)
(remote_static_tracepoint_marker_at)
(remote_static_tracepoint_markers_by_strid)
(remote_get_ada_task_ptid, remote_close, remote_start_remote)
(remote_open): Refactor as methods of remote_target.
(extended_remote_open, extended_remote_detach)
(extended_remote_attach, extended_remote_post_attach):
(extended_remote_supports_disable_randomization)
(extended_remote_create_inferior): : Refactor as method of
extended_remote_target.
(remote_set_permissions, remote_open_1, remote_detach)
(remote_follow_fork, remote_follow_exec, remote_disconnect)
(remote_resume, remote_commit_resume, remote_stop)
(remote_interrupt, remote_pass_ctrlc, remote_terminal_inferior)
(remote_terminal_ours, remote_wait, remote_fetch_registers)
(remote_prepare_to_store, remote_store_registers)
(remote_flash_erase, remote_flash_done, remote_files_info)
(remote_kill, remote_mourn, remote_insert_breakpoint)
(remote_remove_breakpoint, remote_insert_watchpoint)
(remote_watchpoint_addr_within_range)
(remote_remove_watchpoint, remote_region_ok_for_hw_watchpoint)
(remote_check_watch_resources, remote_stopped_by_sw_breakpoint)
(remote_supports_stopped_by_sw_breakpoint)
(remote_stopped_by_hw_breakpoint)
(remote_supports_stopped_by_hw_breakpoint)
(remote_stopped_by_watchpoint, remote_stopped_data_address)
(remote_insert_hw_breakpoint, remote_remove_hw_breakpoint)
(remote_verify_memory): Refactor as methods of remote_target.
(remote_write_qxfer, remote_read_qxfer): Remove target_ops
parameter.
(remote_xfer_partial, remote_get_memory_xfer_limit)
(remote_search_memory, remote_rcmd, remote_memory_map)
(remote_pid_to_str, remote_get_thread_local_address)
(remote_get_tib_address, remote_read_description): Refactor as
methods of remote_target.
(remote_target::fileio_open, remote_target::fileio_pwrite)
(remote_target::fileio_pread, remote_target::fileio_close): New.
(remote_hostio_readlink, remote_hostio_fstat)
(remote_filesystem_is_local, remote_can_execute_reverse)
(remote_supports_non_stop, remote_supports_disable_randomization)
(remote_supports_multi_process, remote_supports_cond_breakpoints)
(remote_supports_enable_disable_tracepoint)
(remote_supports_string_tracing)
(remote_can_run_breakpoint_commands, remote_trace_init)
(remote_download_tracepoint, remote_can_download_tracepoint)
(remote_download_trace_state_variable, remote_enable_tracepoint)
(remote_disable_tracepoint, remote_trace_set_readonly_regions)
(remote_trace_start, remote_get_trace_status)
(remote_get_tracepoint_status, remote_trace_stop)
(remote_trace_find, remote_get_trace_state_variable_value)
(remote_save_trace_data, remote_get_raw_trace_data)
(remote_set_disconnected_tracing, remote_core_of_thread)
(remote_set_circular_trace_buffer, remote_traceframe_info)
(remote_get_min_fast_tracepoint_insn_len)
(remote_set_trace_buffer_size, remote_set_trace_notes)
(remote_use_agent, remote_can_use_agent, remote_enable_btrace)
(remote_disable_btrace, remote_teardown_btrace)
(remote_read_btrace, remote_btrace_conf)
(remote_augmented_libraries_svr4_read, remote_load)
(remote_pid_to_exec_file, remote_can_do_single_step)
(remote_execution_direction, remote_thread_handle_to_thread_info):
Refactor as methods of remote_target.
(init_remote_ops, init_extended_remote_ops): Delete.
(remote_can_async_p, remote_is_async_p, remote_async)
(remote_thread_events, remote_upload_tracepoints)
(remote_upload_trace_state_variables): Refactor as methods of
remote_target.
(_initialize_remote): Remove references to init_remote_ops and
init_extended_remote_ops.
* remote-sim.c (gdbsim_target): New class.
(gdbsim_fetch_register, gdbsim_store_register, gdbsim_kill)
(gdbsim_load, gdbsim_create_inferior, gdbsim_open, gdbsim_close)
(gdbsim_detach, gdbsim_resume, gdbsim_interrupt)
(gdbsim_wait, gdbsim_prepare_to_store, gdbsim_xfer_partial)
(gdbsim_files_info, gdbsim_mourn_inferior, gdbsim_thread_alive)
(gdbsim_pid_to_str, gdbsim_has_all_memory, gdbsim_has_memory):
Refactor as methods of gdbsim_target.
(gdbsim_ops): Now a gdbsim_target.
(init_gdbsim_ops): Delete.
(gdbsim_cntrl_c): Adjust.
(_initialize_remote_sim): Remove reference to init_gdbsim_ops.
* amd64-linux-nat.c (amd64_linux_nat_target): New class.
(the_amd64_linux_nat_target): New.
(amd64_linux_fetch_inferior_registers)
(amd64_linux_store_inferior_registers): Refactor as methods of
amd64_linux_nat_target.
(_initialize_amd64_linux_nat): Adjust. Set linux_target.
* i386-linux-nat.c: Don't include "linux-nat.h".
(i386_linux_nat_target): New class.
(the_i386_linux_nat_target): New.
(i386_linux_fetch_inferior_registers)
(i386_linux_store_inferior_registers, i386_linux_resume): Refactor
as methods of i386_linux_nat_target.
(_initialize_i386_linux_nat): Adjust. Set linux_target.
* inf-child.c (inf_child_ops): Delete.
(inf_child_fetch_inferior_registers)
(inf_child_store_inferior_registers): Delete.
(inf_child_post_attach, inf_child_prepare_to_store): Refactor as
methods of inf_child_target.
(inf_child_target::supports_terminal_ours)
(inf_child_target::terminal_init)
(inf_child_target::terminal_inferior)
(inf_child_target::terminal_ours_for_output)
(inf_child_target::terminal_ours, inf_child_target::interrupt)
(inf_child_target::pass_ctrlc, inf_child_target::terminal_info):
New.
(inf_child_open, inf_child_disconnect, inf_child_close)
(inf_child_mourn_inferior, inf_child_maybe_unpush_target)
(inf_child_post_startup_inferior, inf_child_can_run)
(inf_child_pid_to_exec_file): Refactor as methods of
inf_child_target.
(inf_child_follow_fork): Delete.
(inf_child_target::can_create_inferior)
(inf_child_target::can_attach): New.
(inf_child_target::has_all_memory, inf_child_target::has_memory)
(inf_child_target::has_stack, inf_child_target::has_registers)
(inf_child_target::has_execution): New.
(inf_child_fileio_open, inf_child_fileio_pwrite)
(inf_child_fileio_pread, inf_child_fileio_fstat)
(inf_child_fileio_close, inf_child_fileio_unlink)
(inf_child_fileio_readlink, inf_child_use_agent)
(inf_child_can_use_agent): Refactor as methods of
inf_child_target.
(return_zero, inf_child_target): Delete.
(inf_child_target::inf_child_target): New.
* inf-child.h: Include "target.h".
(inf_child_target): Delete function prototype.
(inf_child_target): New class.
(inf_child_open_target, inf_child_mourn_inferior)
(inf_child_maybe_unpush_target): Delete.
* inf-ptrace.c (inf_ptrace_target::~inf_ptrace_target): New.
(inf_ptrace_follow_fork, inf_ptrace_insert_fork_catchpoint)
(inf_ptrace_remove_fork_catchpoint, inf_ptrace_create_inferior)
(inf_ptrace_post_startup_inferior, inf_ptrace_mourn_inferior)
(inf_ptrace_attach, inf_ptrace_post_attach, inf_ptrace_detach)
(inf_ptrace_detach_success, inf_ptrace_kill, inf_ptrace_resume)
(inf_ptrace_wait, inf_ptrace_xfer_partial)
(inf_ptrace_thread_alive, inf_ptrace_files_info)
(inf_ptrace_pid_to_str, inf_ptrace_auxv_parse): Refactor as
methods of inf_ptrace_target.
(inf_ptrace_target): Delete function.
* inf-ptrace.h: Include "inf-child.h".
(inf_ptrace_target): Delete function declaration.
(inf_ptrace_target): New class.
(inf_ptrace_trad_target, inf_ptrace_detach_success): Delete.
* linux-nat.c (linux_target): New.
(linux_ops, linux_ops_saved, super_xfer_partial): Delete.
(linux_nat_target::~linux_nat_target): New.
(linux_child_post_attach, linux_child_post_startup_inferior)
(linux_child_follow_fork, linux_child_insert_fork_catchpoint)
(linux_child_remove_fork_catchpoint)
(linux_child_insert_vfork_catchpoint)
(linux_child_remove_vfork_catchpoint)
(linux_child_insert_exec_catchpoint)
(linux_child_remove_exec_catchpoint)
(linux_child_set_syscall_catchpoint, linux_nat_pass_signals)
(linux_nat_create_inferior, linux_nat_attach, linux_nat_detach)
(linux_nat_resume, linux_nat_stopped_by_watchpoint)
(linux_nat_stopped_data_address)
(linux_nat_stopped_by_sw_breakpoint)
(linux_nat_supports_stopped_by_sw_breakpoint)
(linux_nat_stopped_by_hw_breakpoint)
(linux_nat_supports_stopped_by_hw_breakpoint, linux_nat_wait)
(linux_nat_kill, linux_nat_mourn_inferior)
(linux_nat_xfer_partial, linux_nat_thread_alive)
(linux_nat_update_thread_list, linux_nat_pid_to_str)
(linux_nat_thread_name, linux_child_pid_to_exec_file)
(linux_child_static_tracepoint_markers_by_strid)
(linux_nat_is_async_p, linux_nat_can_async_p)
(linux_nat_supports_non_stop, linux_nat_always_non_stop_p)
(linux_nat_supports_multi_process)
(linux_nat_supports_disable_randomization, linux_nat_async)
(linux_nat_stop, linux_nat_close, linux_nat_thread_address_space)
(linux_nat_core_of_thread, linux_nat_filesystem_is_local)
(linux_nat_fileio_open, linux_nat_fileio_readlink)
(linux_nat_fileio_unlink, linux_nat_thread_events): Refactor as
methods of linux_nat_target.
(linux_nat_wait_1, linux_xfer_siginfo, linux_proc_xfer_partial)
(linux_proc_xfer_spu, linux_nat_xfer_osdata): Remove target_ops
parameter.
(check_stopped_by_watchpoint): Adjust.
(linux_xfer_partial): Delete.
(linux_target_install_ops, linux_target, linux_nat_add_target):
Delete.
(linux_nat_target::linux_nat_target): New.
* linux-nat.h: Include "inf-ptrace.h".
(linux_nat_target): New.
(linux_target, linux_target_install_ops, linux_nat_add_target):
Delete function declarations.
(linux_target): Declare global.
* linux-thread-db.c (thread_db_target): New.
(thread_db_target::thread_db_target): New.
(thread_db_ops): Delete.
(the_thread_db_target): New.
(thread_db_detach, thread_db_wait, thread_db_mourn_inferior)
(thread_db_update_thread_list, thread_db_pid_to_str)
(thread_db_extra_thread_info)
(thread_db_thread_handle_to_thread_info)
(thread_db_get_thread_local_address, thread_db_get_ada_task_ptid)
(thread_db_resume): Refactor as methods of thread_db_target.
(init_thread_db_ops): Delete.
(_initialize_thread_db): Remove reference to init_thread_db_ops.
* x86-linux-nat.c: Don't include "linux-nat.h".
(super_post_startup_inferior): Delete.
(x86_linux_nat_target::~x86_linux_nat_target): New.
(x86_linux_child_post_startup_inferior)
(x86_linux_read_description, x86_linux_enable_btrace)
(x86_linux_disable_btrace, x86_linux_teardown_btrace)
(x86_linux_read_btrace, x86_linux_btrace_conf): Refactor as
methods of x86_linux_nat_target.
(x86_linux_create_target): Delete. Bits folded ...
(x86_linux_add_target): ... here. Now takes a linux_nat_target
pointer.
* x86-linux-nat.h: Include "linux-nat.h" and "x86-nat.h".
(x86_linux_nat_target): New class.
(x86_linux_create_target): Delete.
(x86_linux_add_target): Now takes a linux_nat_target pointer.
* x86-nat.c (x86_insert_watchpoint, x86_remove_watchpoint)
(x86_region_ok_for_watchpoint, x86_stopped_data_address)
(x86_stopped_by_watchpoint, x86_insert_hw_breakpoint)
(x86_remove_hw_breakpoint, x86_can_use_hw_breakpoint)
(x86_stopped_by_hw_breakpoint): Remove target_ops parameter and
make extern.
(x86_use_watchpoints): Delete.
* x86-nat.h: Include "breakpoint.h" and "target.h".
(x86_use_watchpoints): Delete.
(x86_can_use_hw_breakpoint, x86_region_ok_for_hw_watchpoint)
(x86_stopped_by_watchpoint, x86_stopped_data_address)
(x86_insert_watchpoint, x86_remove_watchpoint)
(x86_insert_hw_breakpoint, x86_remove_hw_breakpoint)
(x86_stopped_by_hw_breakpoint): New declarations.
(x86_nat_target): New template class.
* ppc-linux-nat.c (ppc_linux_nat_target): New class.
(the_ppc_linux_nat_target): New.
(ppc_linux_fetch_inferior_registers)
(ppc_linux_can_use_hw_breakpoint)
(ppc_linux_region_ok_for_hw_watchpoint)
(ppc_linux_ranged_break_num_registers)
(ppc_linux_insert_hw_breakpoint, ppc_linux_remove_hw_breakpoint)
(ppc_linux_insert_mask_watchpoint)
(ppc_linux_remove_mask_watchpoint)
(ppc_linux_can_accel_watchpoint_condition)
(ppc_linux_insert_watchpoint, ppc_linux_remove_watchpoint)
(ppc_linux_stopped_data_address, ppc_linux_stopped_by_watchpoint)
(ppc_linux_watchpoint_addr_within_range)
(ppc_linux_masked_watch_num_registers)
(ppc_linux_store_inferior_registers, ppc_linux_auxv_parse)
(ppc_linux_read_description): Refactor as methods of
ppc_linux_nat_target.
(_initialize_ppc_linux_nat): Adjust. Set linux_target.
* procfs.c (procfs_xfer_partial): Delete forward declaration.
(procfs_target): New class.
(the_procfs_target): New.
(procfs_target): Delete function.
(procfs_auxv_parse, procfs_attach, procfs_detach)
(procfs_fetch_registers, procfs_store_registers, procfs_wait)
(procfs_xfer_partial, procfs_resume, procfs_pass_signals)
(procfs_files_info, procfs_kill_inferior, procfs_mourn_inferior)
(procfs_create_inferior, procfs_update_thread_list)
(procfs_thread_alive, procfs_pid_to_str)
(procfs_can_use_hw_breakpoint, procfs_stopped_by_watchpoint)
(procfs_stopped_data_address, procfs_insert_watchpoint)
(procfs_remove_watchpoint, procfs_region_ok_for_hw_watchpoint)
(proc_find_memory_regions, procfs_info_proc)
(procfs_make_note_section): Refactor as methods of procfs_target.
(_initialize_procfs): Adjust.
* sol-thread.c (sol_thread_target): New class.
(sol_thread_ops): Now a sol_thread_target.
(sol_thread_detach, sol_thread_resume, sol_thread_wait)
(sol_thread_fetch_registers, sol_thread_store_registers)
(sol_thread_xfer_partial, sol_thread_mourn_inferior)
(sol_thread_alive, solaris_pid_to_str, sol_update_thread_list)
(sol_get_ada_task_ptid): Refactor as methods of sol_thread_target.
(init_sol_thread_ops): Delete.
(_initialize_sol_thread): Adjust. Remove references to
init_sol_thread_ops and complete_target_initialization.
* windows-nat.c (windows_nat_target): New class.
(windows_fetch_inferior_registers)
(windows_store_inferior_registers, windows_resume, windows_wait)
(windows_attach, windows_detach, windows_pid_to_exec_file)
(windows_files_info, windows_create_inferior)
(windows_mourn_inferior, windows_interrupt, windows_kill_inferior)
(windows_close, windows_pid_to_str, windows_xfer_partial)
(windows_get_tib_address, windows_get_ada_task_ptid)
(windows_thread_name, windows_thread_alive): Refactor as
windows_nat_target methods.
(do_initial_windows_stuff): Adjust.
(windows_target): Delete function.
(_initialize_windows_nat): Adjust.
* darwin-nat.c (darwin_resume, darwin_wait_to, darwin_interrupt)
(darwin_mourn_inferior, darwin_kill_inferior)
(darwin_create_inferior, darwin_attach, darwin_detach)
(darwin_pid_to_str, darwin_thread_alive, darwin_xfer_partial)
(darwin_pid_to_exec_file, darwin_get_ada_task_ptid)
(darwin_supports_multi_process): Refactor as darwin_nat_target
methods.
(darwin_resume_to, darwin_files_info): Delete.
(_initialize_darwin_inferior): Rename to ...
(_initialize_darwin_nat): ... this. Adjust to C++ification.
* darwin-nat.h: Include "inf-child.h".
(darwin_nat_target): New class.
(darwin_complete_target): Delete.
* i386-darwin-nat.c (i386_darwin_nat_target): New class.
(darwin_target): New.
(i386_darwin_fetch_inferior_registers)
(i386_darwin_store_inferior_registers): Refactor as methods of
darwin_nat_target.
(darwin_complete_target): Delete, with ...
(_initialize_i386_darwin_nat): ... bits factored out here.
* alpha-linux-nat.c (alpha_linux_nat_target): New class.
(the_alpha_linux_nat_target): New.
(alpha_linux_register_u_offset): Refactor as
alpha_linux_nat_target method.
(_initialize_alpha_linux_nat): Adjust.
* linux-nat-trad.c (inf_ptrace_register_u_offset): Delete.
(inf_ptrace_fetch_register, inf_ptrace_fetch_registers)
(inf_ptrace_store_register, inf_ptrace_store_registers): Refact as
methods of linux_nat_trad_target.
(linux_trad_target): Delete.
* linux-nat-trad.h (linux_trad_target): Delete function.
(linux_nat_trad_target): New class.
* mips-linux-nat.c (mips_linux_nat_target): New class.
(super_fetch_registers, super_store_registers, super_close):
Delete.
(the_mips_linux_nat_target): New.
(mips64_linux_regsets_fetch_registers)
(mips64_linux_regsets_store_registers)
(mips64_linux_fetch_registers, mips64_linux_store_registers)
(mips_linux_register_u_offset, mips_linux_read_description)
(mips_linux_can_use_hw_breakpoint)
(mips_linux_stopped_by_watchpoint)
(mips_linux_stopped_data_address)
(mips_linux_region_ok_for_hw_watchpoint)
(mips_linux_insert_watchpoint, mips_linux_remove_watchpoint)
(mips_linux_close): Refactor as methods of mips_linux_nat.
(_initialize_mips_linux_nat): Adjust to C++ification.
* aix-thread.c (aix_thread_target): New class.
(aix_thread_ops): Now an aix_thread_target.
(aix_thread_detach, aix_thread_resume, aix_thread_wait)
(aix_thread_fetch_registers, aix_thread_store_registers)
(aix_thread_xfer_partial, aix_thread_mourn_inferior)
(aix_thread_thread_alive, aix_thread_pid_to_str)
(aix_thread_extra_thread_info, aix_thread_get_ada_task_ptid):
Refactor as methods of aix_thread_target.
(init_aix_thread_ops): Delete.
(_initialize_aix_thread): Remove references to init_aix_thread_ops
and complete_target_initialization.
* rs6000-nat.c (rs6000_xfer_shared_libraries): Delete.
(rs6000_nat_target): New class.
(the_rs6000_nat_target): New.
(rs6000_fetch_inferior_registers, rs6000_store_inferior_registers)
(rs6000_xfer_partial, rs6000_wait, rs6000_create_inferior)
(rs6000_xfer_shared_libraries): Refactor as rs6000_nat_target methods.
(super_create_inferior): Delete.
(_initialize_rs6000_nat): Adjust to C++ification.
* arm-linux-nat.c (arm_linux_nat_target): New class.
(the_arm_linux_nat_target): New.
(arm_linux_fetch_inferior_registers)
(arm_linux_store_inferior_registers, arm_linux_read_description)
(arm_linux_can_use_hw_breakpoint, arm_linux_insert_hw_breakpoint)
(arm_linux_remove_hw_breakpoint)
(arm_linux_region_ok_for_hw_watchpoint)
(arm_linux_insert_watchpoint, arm_linux_remove_watchpoint)
(arm_linux_stopped_data_address, arm_linux_stopped_by_watchpoint)
(arm_linux_watchpoint_addr_within_range): Refactor as methods of
arm_linux_nat_target.
(_initialize_arm_linux_nat): Adjust to C++ification.
* aarch64-linux-nat.c (aarch64_linux_nat_target): New class.
(the_aarch64_linux_nat_target): New.
(aarch64_linux_fetch_inferior_registers)
(aarch64_linux_store_inferior_registers)
(aarch64_linux_child_post_startup_inferior)
(aarch64_linux_read_description)
(aarch64_linux_can_use_hw_breakpoint)
(aarch64_linux_insert_hw_breakpoint)
(aarch64_linux_remove_hw_breakpoint)
(aarch64_linux_insert_watchpoint, aarch64_linux_remove_watchpoint)
(aarch64_linux_region_ok_for_hw_watchpoint)
(aarch64_linux_stopped_data_address)
(aarch64_linux_stopped_by_watchpoint)
(aarch64_linux_watchpoint_addr_within_range)
(aarch64_linux_can_do_single_step): Refactor as methods of
aarch64_linux_nat_target.
(super_post_startup_inferior): Delete.
(_initialize_aarch64_linux_nat): Adjust to C++ification.
* hppa-linux-nat.c (hppa_linux_nat_target): New class.
(the_hppa_linux_nat_target): New.
(hppa_linux_fetch_inferior_registers)
(hppa_linux_store_inferior_registers): Refactor as methods of
hppa_linux_nat_target.
(_initialize_hppa_linux_nat): Adjust to C++ification.
* ia64-linux-nat.c (ia64_linux_nat_target): New class.
(the_ia64_linux_nat_target): New.
(ia64_linux_insert_watchpoint, ia64_linux_remove_watchpoint)
(ia64_linux_stopped_data_address)
(ia64_linux_stopped_by_watchpoint, ia64_linux_fetch_registers)
(ia64_linux_store_registers, ia64_linux_xfer_partial): Refactor as
ia64_linux_nat_target methods.
(super_xfer_partial): Delete.
(_initialize_ia64_linux_nat): Adjust to C++ification.
* m32r-linux-nat.c (m32r_linux_nat_target): New class.
(the_m32r_linux_nat_target): New.
(m32r_linux_fetch_inferior_registers)
(m32r_linux_store_inferior_registers): Refactor as
m32r_linux_nat_target methods.
(_initialize_m32r_linux_nat): Adjust to C++ification.
* m68k-linux-nat.c (m68k_linux_nat_target): New class.
(the_m68k_linux_nat_target): New.
(m68k_linux_fetch_inferior_registers)
(m68k_linux_store_inferior_registers): Refactor as
m68k_linux_nat_target methods.
(_initialize_m68k_linux_nat): Adjust to C++ification.
* s390-linux-nat.c (s390_linux_nat_target): New class.
(the_s390_linux_nat_target): New.
(s390_linux_fetch_inferior_registers)
(s390_linux_store_inferior_registers, s390_stopped_by_watchpoint)
(s390_insert_watchpoint, s390_remove_watchpoint)
(s390_can_use_hw_breakpoint, s390_insert_hw_breakpoint)
(s390_remove_hw_breakpoint, s390_region_ok_for_hw_watchpoint)
(s390_auxv_parse, s390_read_description): Refactor as methods of
s390_linux_nat_target.
(_initialize_s390_nat): Adjust to C++ification.
* sparc-linux-nat.c (sparc_linux_nat_target): New class.
(the_sparc_linux_nat_target): New.
(_initialize_sparc_linux_nat): Adjust to C++ification.
* sparc-nat.c (sparc_fetch_inferior_registers)
(sparc_store_inferior_registers): Remove target_ops parameter.
* sparc-nat.h (sparc_fetch_inferior_registers)
(sparc_store_inferior_registers): Remove target_ops parameter.
* sparc64-linux-nat.c (sparc64_linux_nat_target): New class.
(the_sparc64_linux_nat_target): New.
(_initialize_sparc64_linux_nat): Adjust to C++ification.
* spu-linux-nat.c (spu_linux_nat_target): New class.
(the_spu_linux_nat_target): New.
(spu_child_post_startup_inferior, spu_child_post_attach)
(spu_child_wait, spu_fetch_inferior_registers)
(spu_store_inferior_registers, spu_xfer_partial)
(spu_can_use_hw_breakpoint): Refactor as spu_linux_nat_target
methods.
(_initialize_spu_nat): Adjust to C++ification.
* tilegx-linux-nat.c (tilegx_linux_nat_target): New class.
(the_tilegx_linux_nat_target): New.
(fetch_inferior_registers, store_inferior_registers):
Refactor as methods.
(_initialize_tile_linux_nat): Adjust to C++ification.
* xtensa-linux-nat.c (xtensa_linux_nat_target): New class.
(the_xtensa_linux_nat_target): New.
(xtensa_linux_fetch_inferior_registers)
(xtensa_linux_store_inferior_registers): Refactor as
xtensa_linux_nat_target methods.
(_initialize_xtensa_linux_nat): Adjust to C++ification.
* fbsd-nat.c (USE_SIGTRAP_SIGINFO): Delete.
(fbsd_pid_to_exec_file, fbsd_find_memory_regions)
(fbsd_find_memory_regions, fbsd_info_proc, fbsd_xfer_partial)
(fbsd_thread_alive, fbsd_pid_to_str, fbsd_thread_name)
(fbsd_update_thread_list, fbsd_resume, fbsd_wait)
(fbsd_stopped_by_sw_breakpoint)
(fbsd_supports_stopped_by_sw_breakpoint, fbsd_follow_fork)
(fbsd_insert_fork_catchpoint, fbsd_remove_fork_catchpoint)
(fbsd_insert_vfork_catchpoint, fbsd_remove_vfork_catchpoint)
(fbsd_post_startup_inferior, fbsd_post_attach)
(fbsd_insert_exec_catchpoint, fbsd_remove_exec_catchpoint)
(fbsd_set_syscall_catchpoint)
(super_xfer_partial, super_resume, super_wait)
(fbsd_supports_stopped_by_hw_breakpoint): Delete.
(fbsd_handle_debug_trap): Remove target_ops parameter.
(fbsd_nat_add_target): Delete.
* fbsd-nat.h: Include "inf-ptrace.h".
(fbsd_nat_add_target): Delete.
(USE_SIGTRAP_SIGINFO): Define.
(fbsd_nat_target): New class.
* amd64-bsd-nat.c (amd64bsd_fetch_inferior_registers)
(amd64bsd_store_inferior_registers): Remove target_ops parameter.
(amd64bsd_target): Delete.
* amd64-bsd-nat.h: New file.
* amd64-fbsd-nat.c: Include "amd64-bsd-nat.h" instead of
"x86-bsd-nat.h".
(amd64_fbsd_nat_target): New class.
(the_amd64_fbsd_nat_target): New.
(amd64fbsd_read_description): Refactor as method of
amd64_fbsd_nat_target.
(amd64_fbsd_nat_target::supports_stopped_by_hw_breakpoint): New.
(_initialize_amd64fbsd_nat): Adjust to C++ification.
* amd64-nat.h (amd64bsd_target): Delete function declaration.
* i386-bsd-nat.c (i386bsd_fetch_inferior_registers)
(i386bsd_store_inferior_registers): Remove target_ops parameter.
(i386bsd_target): Delete.
* i386-bsd-nat.h (i386bsd_target): Delete function declaration.
(i386bsd_fetch_inferior_registers)
(i386bsd_store_inferior_registers): Declare.
(i386_bsd_nat_target): New class.
* i386-fbsd-nat.c (i386_fbsd_nat_target): New class.
(the_i386_fbsd_nat_target): New.
(i386fbsd_resume, i386fbsd_read_description): Refactor as
i386_fbsd_nat_target methods.
(i386_fbsd_nat_target::supports_stopped_by_hw_breakpoint): New.
(_initialize_i386fbsd_nat): Adjust to C++ification.
* x86-bsd-nat.c (super_mourn_inferior): Delete.
(x86bsd_mourn_inferior, x86bsd_target): Delete.
(_initialize_x86_bsd_nat): Adjust to C++ification.
* x86-bsd-nat.h: Include "x86-nat.h".
(x86bsd_target): Delete declaration.
(x86bsd_nat_target): New class.
* aarch64-fbsd-nat.c (aarch64_fbsd_nat_target): New class.
(the_aarch64_fbsd_nat_target): New.
(aarch64_fbsd_fetch_inferior_registers)
(aarch64_fbsd_store_inferior_registers): Refactor as methods of
aarch64_fbsd_nat_target.
(_initialize_aarch64_fbsd_nat): Adjust to C++ification.
* alpha-bsd-nat.c (alpha_bsd_nat_target): New class.
(the_alpha_bsd_nat_target): New.
(alphabsd_fetch_inferior_registers)
(alphabsd_store_inferior_registers): Refactor as
alpha_bsd_nat_target methods.
(_initialize_alphabsd_nat): Refactor as methods of
alpha_bsd_nat_target.
* amd64-nbsd-nat.c: Include "amd64-bsd-nat.h".
(the_amd64_nbsd_nat_target): New.
(_initialize_amd64nbsd_nat): Adjust to C++ification.
* amd64-obsd-nat.c: Include "amd64-bsd-nat.h".
(the_amd64_obsd_nat_target): New.
(_initialize_amd64obsd_nat): Adjust to C++ification.
* arm-fbsd-nat.c (arm_fbsd_nat_target): New.
(the_arm_fbsd_nat_target): New.
(arm_fbsd_fetch_inferior_registers)
(arm_fbsd_store_inferior_registers, arm_fbsd_read_description):
(_initialize_arm_fbsd_nat): Refactor as methods of
arm_fbsd_nat_target.
(_initialize_arm_fbsd_nat): Adjust to C++ification.
* arm-nbsd-nat.c (arm_netbsd_nat_target): New class.
(the_arm_netbsd_nat_target): New.
(armnbsd_fetch_registers, armnbsd_store_registers): Refactor as
arm_netbsd_nat_target.
(_initialize_arm_netbsd_nat): Adjust to C++ification.
* hppa-nbsd-nat.c (hppa_nbsd_nat_target): New class.
(the_hppa_nbsd_nat_target): New.
(hppanbsd_fetch_registers, hppanbsd_store_registers): Refactor as
hppa_nbsd_nat_target methods.
(_initialize_hppanbsd_nat): Adjust to C++ification.
* hppa-obsd-nat.c (hppa_obsd_nat_target): New class.
(the_hppa_obsd_nat_target): New.
(hppaobsd_fetch_registers, hppaobsd_store_registers): Refactor as
methods of hppa_obsd_nat_target.
(_initialize_hppaobsd_nat): Adjust to C++ification. Use
add_target.
* i386-nbsd-nat.c (the_i386_nbsd_nat_target): New.
(_initialize_i386nbsd_nat): Adjust to C++ification. Use
add_target.
* i386-obsd-nat.c (the_i386_obsd_nat_target): New.
(_initialize_i386obsd_nat): Use add_target.
* m68k-bsd-nat.c (m68k_bsd_nat_target): New class.
(the_m68k_bsd_nat_target): New.
(m68kbsd_fetch_inferior_registers)
(m68kbsd_store_inferior_registers): Refactor as methods of
m68k_bsd_nat_target.
(_initialize_m68kbsd_nat): Adjust to C++ification.
* mips-fbsd-nat.c (mips_fbsd_nat_target): New class.
(the_mips_fbsd_nat_target): New.
(mips_fbsd_fetch_inferior_registers)
(mips_fbsd_store_inferior_registers): Refactor as methods of
mips_fbsd_nat_target.
(_initialize_mips_fbsd_nat): Adjust to C++ification. Use
add_target.
* mips-nbsd-nat.c (mips_nbsd_nat_target): New class.
(the_mips_nbsd_nat_target): New.
(mipsnbsd_fetch_inferior_registers)
(mipsnbsd_store_inferior_registers): Refactor as methods of
mips_nbsd_nat_target.
(_initialize_mipsnbsd_nat): Adjust to C++ification.
* mips64-obsd-nat.c (mips64_obsd_nat_target): New class.
(the_mips64_obsd_nat_target): New.
(mips64obsd_fetch_inferior_registers)
(mips64obsd_store_inferior_registers): Refactor as methods of
mips64_obsd_nat_target.
(_initialize_mips64obsd_nat): Adjust to C++ification. Use
add_target.
* nbsd-nat.c (nbsd_pid_to_exec_file): Refactor as method of
nbsd_nat_target.
* nbsd-nat.h: Include "inf-ptrace.h".
(nbsd_nat_target): New class.
* obsd-nat.c (obsd_pid_to_str, obsd_update_thread_list)
(obsd_wait): Refactor as methods of obsd_nat_target.
(obsd_add_target): Delete.
* obsd-nat.h: Include "inf-ptrace.h".
(obsd_nat_target): New class.
* ppc-fbsd-nat.c (ppc_fbsd_nat_target): New class.
(the_ppc_fbsd_nat_target): New.
(ppcfbsd_fetch_inferior_registers)
(ppcfbsd_store_inferior_registers): Refactor as methods of
ppc_fbsd_nat_target.
(_initialize_ppcfbsd_nat): Adjust to C++ification. Use
add_target.
* ppc-nbsd-nat.c (ppc_nbsd_nat_target): New class.
(the_ppc_nbsd_nat_target): New.
(ppcnbsd_fetch_inferior_registers)
(ppcnbsd_store_inferior_registers): Refactor as methods of
ppc_nbsd_nat_target.
(_initialize_ppcnbsd_nat): Adjust to C++ification.
* ppc-obsd-nat.c (ppc_obsd_nat_target): New class.
(the_ppc_obsd_nat_target): New.
(ppcobsd_fetch_registers, ppcobsd_store_registers): Refactor as
methods of ppc_obsd_nat_target.
(_initialize_ppcobsd_nat): Adjust to C++ification. Use
add_target.
* sh-nbsd-nat.c (sh_nbsd_nat_target): New class.
(the_sh_nbsd_nat_target): New.
(shnbsd_fetch_inferior_registers)
(shnbsd_store_inferior_registers): Refactor as methods of
sh_nbsd_nat_target.
(_initialize_shnbsd_nat): Adjust to C++ification.
* sparc-nat.c (sparc_xfer_wcookie): Make extern.
(inf_ptrace_xfer_partial): Delete.
(sparc_xfer_partial, sparc_target): Delete.
* sparc-nat.h (sparc_fetch_inferior_registers)
(sparc_store_inferior_registers, sparc_xfer_wcookie): Declare.
(sparc_target): Delete function declaration.
(sparc_target): New template class.
* sparc-nbsd-nat.c (the_sparc_nbsd_nat_target): New.
(_initialize_sparcnbsd_nat): Adjust to C++ification.
* sparc64-fbsd-nat.c (the_sparc64_fbsd_nat_target): New.
(_initialize_sparc64fbsd_nat): Adjust to C++ification. Use
add_target.
* sparc64-nbsd-nat.c (the_sparc64_nbsd_nat_target): New.
(_initialize_sparc64nbsd_nat): Adjust to C++ification.
* sparc64-obsd-nat.c (the_sparc64_obsd_nat_target): New.
(_initialize_sparc64obsd_nat): Adjust to C++ification. Use
add_target.
* vax-bsd-nat.c (vax_bsd_nat_target): New class.
(the_vax_bsd_nat_target): New.
(vaxbsd_fetch_inferior_registers)
(vaxbsd_store_inferior_registers): Refactor as vax_bsd_nat_target
methods.
(_initialize_vaxbsd_nat): Adjust to C++ification.
* bsd-kvm.c (bsd_kvm_target): New class.
(bsd_kvm_ops): Now a bsd_kvm_target.
(bsd_kvm_open, bsd_kvm_close, bsd_kvm_xfer_partial)
(bsd_kvm_files_info, bsd_kvm_fetch_registers)
(bsd_kvm_thread_alive, bsd_kvm_pid_to_str): Refactor as methods of
bsd_kvm_target.
(bsd_kvm_return_one): Delete.
(bsd_kvm_add_target): Adjust to C++ification.
* nto-procfs.c (nto_procfs_target, nto_procfs_target_native)
(nto_procfs_target_procfs): New classes.
(procfs_open_1, procfs_thread_alive, procfs_update_thread_list)
(procfs_files_info, procfs_pid_to_exec_file, procfs_attach)
(procfs_post_attach, procfs_wait, procfs_fetch_registers)
(procfs_xfer_partial, procfs_detach, procfs_insert_breakpoint)
(procfs_remove_breakpoint, procfs_insert_hw_breakpoint)
(procfs_remove_hw_breakpoint, procfs_resume)
(procfs_mourn_inferior, procfs_create_inferior, procfs_interrupt)
(procfs_kill_inferior, procfs_store_registers)
(procfs_pass_signals, procfs_pid_to_str, procfs_can_run): Refactor
as methods of nto_procfs_target.
(nto_procfs_ops): Now an nto_procfs_target_procfs.
(nto_native_ops): Delete.
(procfs_open, procfs_native_open): Delete.
(nto_native_ops): Now an nto_procfs_target_native.
(init_procfs_targets): Adjust to C++ification.
(procfs_can_use_hw_breakpoint, procfs_remove_hw_watchpoint)
(procfs_insert_hw_watchpoint, procfs_stopped_by_watchpoint):
Refactor as methods of nto_procfs_target.
* go32-nat.c (go32_nat_target): New class.
(the_go32_nat_target): New.
(go32_attach, go32_resume, go32_wait, go32_fetch_registers)
(go32_store_registers, go32_xfer_partial, go32_files_info)
(go32_kill_inferior, go32_create_inferior, go32_mourn_inferior)
(go32_terminal_init, go32_terminal_info, go32_terminal_inferior)
(go32_terminal_ours, go32_pass_ctrlc, go32_thread_alive)
(go32_pid_to_str): Refactor as methods of go32_nat_target.
(go32_target): Delete.
(_initialize_go32_nat): Adjust to C++ification.
* gnu-nat.c (gnu_wait, gnu_resume, gnu_kill_inferior)
(gnu_mourn_inferior, gnu_create_inferior, gnu_attach, gnu_detach)
(gnu_stop, gnu_thread_alive, gnu_xfer_partial)
(gnu_find_memory_regions, gnu_pid_to_str): Refactor as methods of
gnu_nat_target.
(gnu_target): Delete.
* gnu-nat.h (gnu_target): Delete.
(gnu_nat_target): New class.
* i386-gnu-nat.c (gnu_base_target): New.
(i386_gnu_nat_target): New class.
(the_i386_gnu_nat_target): New.
(_initialize_i386gnu_nat): Adjust to C++ification.
gdb/testsuite/ChangeLog:
2018-05-02 Pedro Alves <palves@redhat.com>
* gdb.base/breakpoint-in-ro-region.exp: Adjust to to_resume and
to_log_command renames.
* gdb.base/sss-bp-on-user-bp-2.exp: Likewise.
1727 lines
49 KiB
C
1727 lines
49 KiB
C
/* libthread_db assisted debugging support, generic parts.
|
||
|
||
Copyright (C) 1999-2018 Free Software Foundation, Inc.
|
||
|
||
This file is part of GDB.
|
||
|
||
This program is free software; you can redistribute it and/or modify
|
||
it under the terms of the GNU General Public License as published by
|
||
the Free Software Foundation; either version 3 of the License, or
|
||
(at your option) any later version.
|
||
|
||
This program is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||
|
||
#include "defs.h"
|
||
#include <dlfcn.h>
|
||
#include "gdb_proc_service.h"
|
||
#include "nat/gdb_thread_db.h"
|
||
#include "gdb_vecs.h"
|
||
#include "bfd.h"
|
||
#include "command.h"
|
||
#include "gdbcmd.h"
|
||
#include "gdbthread.h"
|
||
#include "inferior.h"
|
||
#include "infrun.h"
|
||
#include "symfile.h"
|
||
#include "objfiles.h"
|
||
#include "target.h"
|
||
#include "regcache.h"
|
||
#include "solib.h"
|
||
#include "solib-svr4.h"
|
||
#include "gdbcore.h"
|
||
#include "observable.h"
|
||
#include "linux-nat.h"
|
||
#include "nat/linux-procfs.h"
|
||
#include "nat/linux-ptrace.h"
|
||
#include "nat/linux-osdata.h"
|
||
#include "auto-load.h"
|
||
#include "cli/cli-utils.h"
|
||
#include <signal.h>
|
||
#include <ctype.h>
|
||
#include "nat/linux-namespaces.h"
|
||
#include <algorithm>
|
||
#include "common/pathstuff.h"
|
||
|
||
/* GNU/Linux libthread_db support.
|
||
|
||
libthread_db is a library, provided along with libpthread.so, which
|
||
exposes the internals of the thread library to a debugger. It
|
||
allows GDB to find existing threads, new threads as they are
|
||
created, thread IDs (usually, the result of pthread_self), and
|
||
thread-local variables.
|
||
|
||
The libthread_db interface originates on Solaris, where it is both
|
||
more powerful and more complicated. This implementation only works
|
||
for NPTL, the glibc threading library. It assumes that each thread
|
||
is permanently assigned to a single light-weight process (LWP). At
|
||
some point it also supported the older LinuxThreads library, but it
|
||
no longer does.
|
||
|
||
libthread_db-specific information is stored in the "private" field
|
||
of struct thread_info. When the field is NULL we do not yet have
|
||
information about the new thread; this could be temporary (created,
|
||
but the thread library's data structures do not reflect it yet)
|
||
or permanent (created using clone instead of pthread_create).
|
||
|
||
Process IDs managed by linux-thread-db.c match those used by
|
||
linux-nat.c: a common PID for all processes, an LWP ID for each
|
||
thread, and no TID. We save the TID in private. Keeping it out
|
||
of the ptid_t prevents thread IDs changing when libpthread is
|
||
loaded or unloaded. */
|
||
|
||
class thread_db_target final : public target_ops
|
||
{
|
||
public:
|
||
thread_db_target ();
|
||
|
||
const char *shortname () override
|
||
{ return "multi-thread"; }
|
||
const char *longname () override
|
||
{ return _("multi-threaded child process."); }
|
||
const char *doc () override
|
||
{ return _("Threads and pthreads support."); }
|
||
|
||
void detach (inferior *, int) override;
|
||
ptid_t wait (ptid_t, struct target_waitstatus *, int) override;
|
||
void resume (ptid_t, int, enum gdb_signal) override;
|
||
void mourn_inferior () override;
|
||
void update_thread_list () override;
|
||
const char *pid_to_str (ptid_t) override;
|
||
CORE_ADDR get_thread_local_address (ptid_t ptid,
|
||
CORE_ADDR load_module_addr,
|
||
CORE_ADDR offset) override;
|
||
const char *extra_thread_info (struct thread_info *) override;
|
||
ptid_t get_ada_task_ptid (long lwp, long thread) override;
|
||
|
||
thread_info *thread_handle_to_thread_info (const gdb_byte *thread_handle,
|
||
int handle_len,
|
||
inferior *inf) override;
|
||
};
|
||
|
||
thread_db_target::thread_db_target ()
|
||
{
|
||
this->to_stratum = thread_stratum;
|
||
}
|
||
|
||
static char *libthread_db_search_path;
|
||
|
||
/* Set to non-zero if thread_db auto-loading is enabled
|
||
by the "set auto-load libthread-db" command. */
|
||
static int auto_load_thread_db = 1;
|
||
|
||
/* "show" command for the auto_load_thread_db configuration variable. */
|
||
|
||
static void
|
||
show_auto_load_thread_db (struct ui_file *file, int from_tty,
|
||
struct cmd_list_element *c, const char *value)
|
||
{
|
||
fprintf_filtered (file, _("Auto-loading of inferior specific libthread_db "
|
||
"is %s.\n"),
|
||
value);
|
||
}
|
||
|
||
static void
|
||
set_libthread_db_search_path (const char *ignored, int from_tty,
|
||
struct cmd_list_element *c)
|
||
{
|
||
if (*libthread_db_search_path == '\0')
|
||
{
|
||
xfree (libthread_db_search_path);
|
||
libthread_db_search_path = xstrdup (LIBTHREAD_DB_SEARCH_PATH);
|
||
}
|
||
}
|
||
|
||
/* If non-zero, print details of libthread_db processing. */
|
||
|
||
static unsigned int libthread_db_debug;
|
||
|
||
static void
|
||
show_libthread_db_debug (struct ui_file *file, int from_tty,
|
||
struct cmd_list_element *c, const char *value)
|
||
{
|
||
fprintf_filtered (file, _("libthread-db debugging is %s.\n"), value);
|
||
}
|
||
|
||
/* If we're running on GNU/Linux, we must explicitly attach to any new
|
||
threads. */
|
||
|
||
/* This module's target vector. */
|
||
static thread_db_target the_thread_db_target;
|
||
|
||
/* Non-zero if we have determined the signals used by the threads
|
||
library. */
|
||
static int thread_signals;
|
||
static sigset_t thread_stop_set;
|
||
static sigset_t thread_print_set;
|
||
|
||
struct thread_db_info
|
||
{
|
||
struct thread_db_info *next;
|
||
|
||
/* Process id this object refers to. */
|
||
int pid;
|
||
|
||
/* Handle from dlopen for libthread_db.so. */
|
||
void *handle;
|
||
|
||
/* Absolute pathname from gdb_realpath to disk file used for dlopen-ing
|
||
HANDLE. It may be NULL for system library. */
|
||
char *filename;
|
||
|
||
/* Structure that identifies the child process for the
|
||
<proc_service.h> interface. */
|
||
struct ps_prochandle proc_handle;
|
||
|
||
/* Connection to the libthread_db library. */
|
||
td_thragent_t *thread_agent;
|
||
|
||
/* True if we need to apply the workaround for glibc/BZ5983. When
|
||
we catch a PTRACE_O_TRACEFORK, and go query the child's thread
|
||
list, nptl_db returns the parent's threads in addition to the new
|
||
(single) child thread. If this flag is set, we do extra work to
|
||
be able to ignore such stale entries. */
|
||
int need_stale_parent_threads_check;
|
||
|
||
/* Pointers to the libthread_db functions. */
|
||
|
||
td_init_ftype *td_init_p;
|
||
td_ta_new_ftype *td_ta_new_p;
|
||
td_ta_map_lwp2thr_ftype *td_ta_map_lwp2thr_p;
|
||
td_ta_thr_iter_ftype *td_ta_thr_iter_p;
|
||
td_thr_get_info_ftype *td_thr_get_info_p;
|
||
td_thr_tls_get_addr_ftype *td_thr_tls_get_addr_p;
|
||
td_thr_tlsbase_ftype *td_thr_tlsbase_p;
|
||
};
|
||
|
||
/* List of known processes using thread_db, and the required
|
||
bookkeeping. */
|
||
struct thread_db_info *thread_db_list;
|
||
|
||
static void thread_db_find_new_threads_1 (ptid_t ptid);
|
||
static void thread_db_find_new_threads_2 (ptid_t ptid, int until_no_new);
|
||
|
||
static void check_thread_signals (void);
|
||
|
||
static struct thread_info *record_thread
|
||
(struct thread_db_info *info, struct thread_info *tp,
|
||
ptid_t ptid, const td_thrhandle_t *th_p, const td_thrinfo_t *ti_p);
|
||
|
||
/* Add the current inferior to the list of processes using libpthread.
|
||
Return a pointer to the newly allocated object that was added to
|
||
THREAD_DB_LIST. HANDLE is the handle returned by dlopen'ing
|
||
LIBTHREAD_DB_SO. */
|
||
|
||
static struct thread_db_info *
|
||
add_thread_db_info (void *handle)
|
||
{
|
||
struct thread_db_info *info = XCNEW (struct thread_db_info);
|
||
|
||
info->pid = ptid_get_pid (inferior_ptid);
|
||
info->handle = handle;
|
||
|
||
/* The workaround works by reading from /proc/pid/status, so it is
|
||
disabled for core files. */
|
||
if (target_has_execution)
|
||
info->need_stale_parent_threads_check = 1;
|
||
|
||
info->next = thread_db_list;
|
||
thread_db_list = info;
|
||
|
||
return info;
|
||
}
|
||
|
||
/* Return the thread_db_info object representing the bookkeeping
|
||
related to process PID, if any; NULL otherwise. */
|
||
|
||
static struct thread_db_info *
|
||
get_thread_db_info (int pid)
|
||
{
|
||
struct thread_db_info *info;
|
||
|
||
for (info = thread_db_list; info; info = info->next)
|
||
if (pid == info->pid)
|
||
return info;
|
||
|
||
return NULL;
|
||
}
|
||
|
||
/* When PID has exited or has been detached, we no longer want to keep
|
||
track of it as using libpthread. Call this function to discard
|
||
thread_db related info related to PID. Note that this closes
|
||
LIBTHREAD_DB_SO's dlopen'ed handle. */
|
||
|
||
static void
|
||
delete_thread_db_info (int pid)
|
||
{
|
||
struct thread_db_info *info, *info_prev;
|
||
|
||
info_prev = NULL;
|
||
|
||
for (info = thread_db_list; info; info_prev = info, info = info->next)
|
||
if (pid == info->pid)
|
||
break;
|
||
|
||
if (info == NULL)
|
||
return;
|
||
|
||
if (info->handle != NULL)
|
||
dlclose (info->handle);
|
||
|
||
xfree (info->filename);
|
||
|
||
if (info_prev)
|
||
info_prev->next = info->next;
|
||
else
|
||
thread_db_list = info->next;
|
||
|
||
xfree (info);
|
||
}
|
||
|
||
/* Use "struct private_thread_info" to cache thread state. This is
|
||
a substantial optimization. */
|
||
|
||
struct thread_db_thread_info : public private_thread_info
|
||
{
|
||
/* Flag set when we see a TD_DEATH event for this thread. */
|
||
bool dying = false;
|
||
|
||
/* Cached thread state. */
|
||
td_thrhandle_t th {};
|
||
thread_t tid {};
|
||
};
|
||
|
||
static thread_db_thread_info *
|
||
get_thread_db_thread_info (thread_info *thread)
|
||
{
|
||
return static_cast<thread_db_thread_info *> (thread->priv.get ());
|
||
}
|
||
|
||
static const char *
|
||
thread_db_err_str (td_err_e err)
|
||
{
|
||
static char buf[64];
|
||
|
||
switch (err)
|
||
{
|
||
case TD_OK:
|
||
return "generic 'call succeeded'";
|
||
case TD_ERR:
|
||
return "generic error";
|
||
case TD_NOTHR:
|
||
return "no thread to satisfy query";
|
||
case TD_NOSV:
|
||
return "no sync handle to satisfy query";
|
||
case TD_NOLWP:
|
||
return "no LWP to satisfy query";
|
||
case TD_BADPH:
|
||
return "invalid process handle";
|
||
case TD_BADTH:
|
||
return "invalid thread handle";
|
||
case TD_BADSH:
|
||
return "invalid synchronization handle";
|
||
case TD_BADTA:
|
||
return "invalid thread agent";
|
||
case TD_BADKEY:
|
||
return "invalid key";
|
||
case TD_NOMSG:
|
||
return "no event message for getmsg";
|
||
case TD_NOFPREGS:
|
||
return "FPU register set not available";
|
||
case TD_NOLIBTHREAD:
|
||
return "application not linked with libthread";
|
||
case TD_NOEVENT:
|
||
return "requested event is not supported";
|
||
case TD_NOCAPAB:
|
||
return "capability not available";
|
||
case TD_DBERR:
|
||
return "debugger service failed";
|
||
case TD_NOAPLIC:
|
||
return "operation not applicable to";
|
||
case TD_NOTSD:
|
||
return "no thread-specific data for this thread";
|
||
case TD_MALLOC:
|
||
return "malloc failed";
|
||
case TD_PARTIALREG:
|
||
return "only part of register set was written/read";
|
||
case TD_NOXREGS:
|
||
return "X register set not available for this thread";
|
||
#ifdef THREAD_DB_HAS_TD_NOTALLOC
|
||
case TD_NOTALLOC:
|
||
return "thread has not yet allocated TLS for given module";
|
||
#endif
|
||
#ifdef THREAD_DB_HAS_TD_VERSION
|
||
case TD_VERSION:
|
||
return "versions of libpthread and libthread_db do not match";
|
||
#endif
|
||
#ifdef THREAD_DB_HAS_TD_NOTLS
|
||
case TD_NOTLS:
|
||
return "there is no TLS segment in the given module";
|
||
#endif
|
||
default:
|
||
snprintf (buf, sizeof (buf), "unknown thread_db error '%d'", err);
|
||
return buf;
|
||
}
|
||
}
|
||
|
||
/* Fetch the user-level thread id of PTID. */
|
||
|
||
static struct thread_info *
|
||
thread_from_lwp (ptid_t ptid)
|
||
{
|
||
td_thrhandle_t th;
|
||
td_thrinfo_t ti;
|
||
td_err_e err;
|
||
struct thread_db_info *info;
|
||
struct thread_info *tp;
|
||
|
||
/* Just in case td_ta_map_lwp2thr doesn't initialize it completely. */
|
||
th.th_unique = 0;
|
||
|
||
/* This ptid comes from linux-nat.c, which should always fill in the
|
||
LWP. */
|
||
gdb_assert (ptid_get_lwp (ptid) != 0);
|
||
|
||
info = get_thread_db_info (ptid_get_pid (ptid));
|
||
|
||
/* Access an lwp we know is stopped. */
|
||
info->proc_handle.ptid = ptid;
|
||
err = info->td_ta_map_lwp2thr_p (info->thread_agent, ptid_get_lwp (ptid),
|
||
&th);
|
||
if (err != TD_OK)
|
||
error (_("Cannot find user-level thread for LWP %ld: %s"),
|
||
ptid_get_lwp (ptid), thread_db_err_str (err));
|
||
|
||
err = info->td_thr_get_info_p (&th, &ti);
|
||
if (err != TD_OK)
|
||
error (_("thread_get_info_callback: cannot get thread info: %s"),
|
||
thread_db_err_str (err));
|
||
|
||
/* Fill the cache. */
|
||
tp = find_thread_ptid (ptid);
|
||
return record_thread (info, tp, ptid, &th, &ti);
|
||
}
|
||
|
||
|
||
/* See linux-nat.h. */
|
||
|
||
int
|
||
thread_db_notice_clone (ptid_t parent, ptid_t child)
|
||
{
|
||
struct thread_db_info *info;
|
||
|
||
info = get_thread_db_info (ptid_get_pid (child));
|
||
|
||
if (info == NULL)
|
||
return 0;
|
||
|
||
thread_from_lwp (child);
|
||
|
||
/* If we do not know about the main thread yet, this would be a good
|
||
time to find it. */
|
||
thread_from_lwp (parent);
|
||
return 1;
|
||
}
|
||
|
||
static void *
|
||
verbose_dlsym (void *handle, const char *name)
|
||
{
|
||
void *sym = dlsym (handle, name);
|
||
if (sym == NULL)
|
||
warning (_("Symbol \"%s\" not found in libthread_db: %s"),
|
||
name, dlerror ());
|
||
return sym;
|
||
}
|
||
|
||
/* Verify inferior's '\0'-terminated symbol VER_SYMBOL starts with "%d.%d" and
|
||
return 1 if this version is lower (and not equal) to
|
||
VER_MAJOR_MIN.VER_MINOR_MIN. Return 0 in all other cases. */
|
||
|
||
static int
|
||
inferior_has_bug (const char *ver_symbol, int ver_major_min, int ver_minor_min)
|
||
{
|
||
struct bound_minimal_symbol version_msym;
|
||
CORE_ADDR version_addr;
|
||
gdb::unique_xmalloc_ptr<char> version;
|
||
int err, got, retval = 0;
|
||
|
||
version_msym = lookup_minimal_symbol (ver_symbol, NULL, NULL);
|
||
if (version_msym.minsym == NULL)
|
||
return 0;
|
||
|
||
version_addr = BMSYMBOL_VALUE_ADDRESS (version_msym);
|
||
got = target_read_string (version_addr, &version, 32, &err);
|
||
if (err == 0 && memchr (version.get (), 0, got) == version.get () + got - 1)
|
||
{
|
||
int major, minor;
|
||
|
||
retval = (sscanf (version.get (), "%d.%d", &major, &minor) == 2
|
||
&& (major < ver_major_min
|
||
|| (major == ver_major_min && minor < ver_minor_min)));
|
||
}
|
||
|
||
return retval;
|
||
}
|
||
|
||
/* Similar as thread_db_find_new_threads_1, but try to silently ignore errors
|
||
if appropriate.
|
||
|
||
Return 1 if the caller should abort libthread_db initialization. Return 0
|
||
otherwise. */
|
||
|
||
static int
|
||
thread_db_find_new_threads_silently (ptid_t ptid)
|
||
{
|
||
|
||
TRY
|
||
{
|
||
thread_db_find_new_threads_2 (ptid, 1);
|
||
}
|
||
|
||
CATCH (except, RETURN_MASK_ERROR)
|
||
{
|
||
if (libthread_db_debug)
|
||
exception_fprintf (gdb_stdlog, except,
|
||
"Warning: thread_db_find_new_threads_silently: ");
|
||
|
||
/* There is a bug fixed between nptl 2.6.1 and 2.7 by
|
||
commit 7d9d8bd18906fdd17364f372b160d7ab896ce909
|
||
where calls to td_thr_get_info fail with TD_ERR for statically linked
|
||
executables if td_thr_get_info is called before glibc has initialized
|
||
itself.
|
||
|
||
If the nptl bug is NOT present in the inferior and still thread_db
|
||
reports an error return 1. It means the inferior has corrupted thread
|
||
list and GDB should fall back only to LWPs.
|
||
|
||
If the nptl bug is present in the inferior return 0 to silently ignore
|
||
such errors, and let gdb enumerate threads again later. In such case
|
||
GDB cannot properly display LWPs if the inferior thread list is
|
||
corrupted. For core files it does not apply, no 'later enumeration'
|
||
is possible. */
|
||
|
||
if (!target_has_execution || !inferior_has_bug ("nptl_version", 2, 7))
|
||
{
|
||
exception_fprintf (gdb_stderr, except,
|
||
_("Warning: couldn't activate thread debugging "
|
||
"using libthread_db: "));
|
||
return 1;
|
||
}
|
||
}
|
||
END_CATCH
|
||
|
||
return 0;
|
||
}
|
||
|
||
/* Lookup a library in which given symbol resides.
|
||
Note: this is looking in GDB process, not in the inferior.
|
||
Returns library name, or NULL. */
|
||
|
||
static const char *
|
||
dladdr_to_soname (const void *addr)
|
||
{
|
||
Dl_info info;
|
||
|
||
if (dladdr (addr, &info) != 0)
|
||
return info.dli_fname;
|
||
return NULL;
|
||
}
|
||
|
||
/* Attempt to initialize dlopen()ed libthread_db, described by INFO.
|
||
Return 1 on success.
|
||
Failure could happen if libthread_db does not have symbols we expect,
|
||
or when it refuses to work with the current inferior (e.g. due to
|
||
version mismatch between libthread_db and libpthread). */
|
||
|
||
static int
|
||
try_thread_db_load_1 (struct thread_db_info *info)
|
||
{
|
||
td_err_e err;
|
||
|
||
/* Initialize pointers to the dynamic library functions we will use.
|
||
Essential functions first. */
|
||
|
||
#define TDB_VERBOSE_DLSYM(info, func) \
|
||
info->func ## _p = (func ## _ftype *) verbose_dlsym (info->handle, #func)
|
||
|
||
#define TDB_DLSYM(info, func) \
|
||
info->func ## _p = (func ## _ftype *) dlsym (info->handle, #func)
|
||
|
||
#define CHK(a) \
|
||
do \
|
||
{ \
|
||
if ((a) == NULL) \
|
||
return 0; \
|
||
} while (0)
|
||
|
||
CHK (TDB_VERBOSE_DLSYM (info, td_init));
|
||
|
||
err = info->td_init_p ();
|
||
if (err != TD_OK)
|
||
{
|
||
warning (_("Cannot initialize libthread_db: %s"),
|
||
thread_db_err_str (err));
|
||
return 0;
|
||
}
|
||
|
||
CHK (TDB_VERBOSE_DLSYM (info, td_ta_new));
|
||
|
||
/* Initialize the structure that identifies the child process. */
|
||
info->proc_handle.ptid = inferior_ptid;
|
||
|
||
/* Now attempt to open a connection to the thread library. */
|
||
err = info->td_ta_new_p (&info->proc_handle, &info->thread_agent);
|
||
if (err != TD_OK)
|
||
{
|
||
if (libthread_db_debug)
|
||
fprintf_unfiltered (gdb_stdlog, _("td_ta_new failed: %s\n"),
|
||
thread_db_err_str (err));
|
||
else
|
||
switch (err)
|
||
{
|
||
case TD_NOLIBTHREAD:
|
||
#ifdef THREAD_DB_HAS_TD_VERSION
|
||
case TD_VERSION:
|
||
#endif
|
||
/* The errors above are not unexpected and silently ignored:
|
||
they just mean we haven't found correct version of
|
||
libthread_db yet. */
|
||
break;
|
||
default:
|
||
warning (_("td_ta_new failed: %s"), thread_db_err_str (err));
|
||
}
|
||
return 0;
|
||
}
|
||
|
||
/* These are essential. */
|
||
CHK (TDB_VERBOSE_DLSYM (info, td_ta_map_lwp2thr));
|
||
CHK (TDB_VERBOSE_DLSYM (info, td_thr_get_info));
|
||
|
||
/* These are not essential. */
|
||
TDB_DLSYM (info, td_thr_tls_get_addr);
|
||
TDB_DLSYM (info, td_thr_tlsbase);
|
||
|
||
/* It's best to avoid td_ta_thr_iter if possible. That walks data
|
||
structures in the inferior's address space that may be corrupted,
|
||
or, if the target is running, may change while we walk them. If
|
||
there's execution (and /proc is mounted), then we're already
|
||
attached to all LWPs. Use thread_from_lwp, which uses
|
||
td_ta_map_lwp2thr instead, which does not walk the thread list.
|
||
|
||
td_ta_map_lwp2thr uses ps_get_thread_area, but we can't use that
|
||
currently on core targets, as it uses ptrace directly. */
|
||
if (target_has_execution
|
||
&& linux_proc_task_list_dir_exists (ptid_get_pid (inferior_ptid)))
|
||
info->td_ta_thr_iter_p = NULL;
|
||
else
|
||
CHK (TDB_VERBOSE_DLSYM (info, td_ta_thr_iter));
|
||
|
||
#undef TDB_VERBOSE_DLSYM
|
||
#undef TDB_DLSYM
|
||
#undef CHK
|
||
|
||
if (info->td_ta_thr_iter_p == NULL)
|
||
{
|
||
struct lwp_info *lp;
|
||
int pid = ptid_get_pid (inferior_ptid);
|
||
|
||
linux_stop_and_wait_all_lwps ();
|
||
|
||
ALL_LWPS (lp)
|
||
if (ptid_get_pid (lp->ptid) == pid)
|
||
thread_from_lwp (lp->ptid);
|
||
|
||
linux_unstop_all_lwps ();
|
||
}
|
||
else if (thread_db_find_new_threads_silently (inferior_ptid) != 0)
|
||
{
|
||
/* Even if libthread_db initializes, if the thread list is
|
||
corrupted, we'd not manage to list any threads. Better reject this
|
||
thread_db, and fall back to at least listing LWPs. */
|
||
return 0;
|
||
}
|
||
|
||
printf_unfiltered (_("[Thread debugging using libthread_db enabled]\n"));
|
||
|
||
if (*libthread_db_search_path || libthread_db_debug)
|
||
{
|
||
struct ui_file *file;
|
||
const char *library;
|
||
|
||
library = dladdr_to_soname ((const void *) *info->td_ta_new_p);
|
||
if (library == NULL)
|
||
library = LIBTHREAD_DB_SO;
|
||
|
||
/* If we'd print this to gdb_stdout when debug output is
|
||
disabled, still print it to gdb_stdout if debug output is
|
||
enabled. User visible output should not depend on debug
|
||
settings. */
|
||
file = *libthread_db_search_path != '\0' ? gdb_stdout : gdb_stdlog;
|
||
fprintf_unfiltered (file, _("Using host libthread_db library \"%s\".\n"),
|
||
library);
|
||
}
|
||
|
||
/* The thread library was detected. Activate the thread_db target
|
||
if this is the first process using it. */
|
||
if (thread_db_list->next == NULL)
|
||
push_target (&the_thread_db_target);
|
||
|
||
return 1;
|
||
}
|
||
|
||
/* Attempt to use LIBRARY as libthread_db. LIBRARY could be absolute,
|
||
relative, or just LIBTHREAD_DB. */
|
||
|
||
static int
|
||
try_thread_db_load (const char *library, int check_auto_load_safe)
|
||
{
|
||
void *handle;
|
||
struct thread_db_info *info;
|
||
|
||
if (libthread_db_debug)
|
||
fprintf_unfiltered (gdb_stdlog,
|
||
_("Trying host libthread_db library: %s.\n"),
|
||
library);
|
||
|
||
if (check_auto_load_safe)
|
||
{
|
||
if (access (library, R_OK) != 0)
|
||
{
|
||
/* Do not print warnings by file_is_auto_load_safe if the library does
|
||
not exist at this place. */
|
||
if (libthread_db_debug)
|
||
fprintf_unfiltered (gdb_stdlog, _("open failed: %s.\n"),
|
||
safe_strerror (errno));
|
||
return 0;
|
||
}
|
||
|
||
if (!file_is_auto_load_safe (library, _("auto-load: Loading libthread-db "
|
||
"library \"%s\" from explicit "
|
||
"directory.\n"),
|
||
library))
|
||
return 0;
|
||
}
|
||
|
||
handle = dlopen (library, RTLD_NOW);
|
||
if (handle == NULL)
|
||
{
|
||
if (libthread_db_debug)
|
||
fprintf_unfiltered (gdb_stdlog, _("dlopen failed: %s.\n"), dlerror ());
|
||
return 0;
|
||
}
|
||
|
||
if (libthread_db_debug && strchr (library, '/') == NULL)
|
||
{
|
||
void *td_init;
|
||
|
||
td_init = dlsym (handle, "td_init");
|
||
if (td_init != NULL)
|
||
{
|
||
const char *const libpath = dladdr_to_soname (td_init);
|
||
|
||
if (libpath != NULL)
|
||
fprintf_unfiltered (gdb_stdlog, _("Host %s resolved to: %s.\n"),
|
||
library, libpath);
|
||
}
|
||
}
|
||
|
||
info = add_thread_db_info (handle);
|
||
|
||
/* Do not save system library name, that one is always trusted. */
|
||
if (strchr (library, '/') != NULL)
|
||
info->filename = gdb_realpath (library).release ();
|
||
|
||
if (try_thread_db_load_1 (info))
|
||
return 1;
|
||
|
||
/* This library "refused" to work on current inferior. */
|
||
delete_thread_db_info (ptid_get_pid (inferior_ptid));
|
||
return 0;
|
||
}
|
||
|
||
/* Subroutine of try_thread_db_load_from_pdir to simplify it.
|
||
Try loading libthread_db in directory(OBJ)/SUBDIR.
|
||
SUBDIR may be NULL. It may also be something like "../lib64".
|
||
The result is true for success. */
|
||
|
||
static int
|
||
try_thread_db_load_from_pdir_1 (struct objfile *obj, const char *subdir)
|
||
{
|
||
const char *obj_name = objfile_name (obj);
|
||
|
||
if (obj_name[0] != '/')
|
||
{
|
||
warning (_("Expected absolute pathname for libpthread in the"
|
||
" inferior, but got %s."), obj_name);
|
||
return 0;
|
||
}
|
||
|
||
std::string path = obj_name;
|
||
size_t cp = path.rfind ('/');
|
||
/* This should at minimum hit the first character. */
|
||
gdb_assert (cp != std::string::npos);
|
||
path.resize (cp + 1);
|
||
if (subdir != NULL)
|
||
path = path + subdir + "/";
|
||
path += LIBTHREAD_DB_SO;
|
||
|
||
return try_thread_db_load (path.c_str (), 1);
|
||
}
|
||
|
||
/* Handle $pdir in libthread-db-search-path.
|
||
Look for libthread_db in directory(libpthread)/SUBDIR.
|
||
SUBDIR may be NULL. It may also be something like "../lib64".
|
||
The result is true for success. */
|
||
|
||
static int
|
||
try_thread_db_load_from_pdir (const char *subdir)
|
||
{
|
||
struct objfile *obj;
|
||
|
||
if (!auto_load_thread_db)
|
||
return 0;
|
||
|
||
ALL_OBJFILES (obj)
|
||
if (libpthread_name_p (objfile_name (obj)))
|
||
{
|
||
if (try_thread_db_load_from_pdir_1 (obj, subdir))
|
||
return 1;
|
||
|
||
/* We may have found the separate-debug-info version of
|
||
libpthread, and it may live in a directory without a matching
|
||
libthread_db. */
|
||
if (obj->separate_debug_objfile_backlink != NULL)
|
||
return try_thread_db_load_from_pdir_1 (obj->separate_debug_objfile_backlink,
|
||
subdir);
|
||
|
||
return 0;
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
|
||
/* Handle $sdir in libthread-db-search-path.
|
||
Look for libthread_db in the system dirs, or wherever a plain
|
||
dlopen(file_without_path) will look.
|
||
The result is true for success. */
|
||
|
||
static int
|
||
try_thread_db_load_from_sdir (void)
|
||
{
|
||
return try_thread_db_load (LIBTHREAD_DB_SO, 0);
|
||
}
|
||
|
||
/* Try to load libthread_db from directory DIR of length DIR_LEN.
|
||
The result is true for success. */
|
||
|
||
static int
|
||
try_thread_db_load_from_dir (const char *dir, size_t dir_len)
|
||
{
|
||
if (!auto_load_thread_db)
|
||
return 0;
|
||
|
||
std::string path = std::string (dir, dir_len) + "/" + LIBTHREAD_DB_SO;
|
||
|
||
return try_thread_db_load (path.c_str (), 1);
|
||
}
|
||
|
||
/* Search libthread_db_search_path for libthread_db which "agrees"
|
||
to work on current inferior.
|
||
The result is true for success. */
|
||
|
||
static int
|
||
thread_db_load_search (void)
|
||
{
|
||
int rc = 0;
|
||
|
||
std::vector<gdb::unique_xmalloc_ptr<char>> dir_vec
|
||
= dirnames_to_char_ptr_vec (libthread_db_search_path);
|
||
|
||
for (const gdb::unique_xmalloc_ptr<char> &this_dir_up : dir_vec)
|
||
{
|
||
const char *this_dir = this_dir_up.get ();
|
||
const int pdir_len = sizeof ("$pdir") - 1;
|
||
size_t this_dir_len;
|
||
|
||
this_dir_len = strlen (this_dir);
|
||
|
||
if (strncmp (this_dir, "$pdir", pdir_len) == 0
|
||
&& (this_dir[pdir_len] == '\0'
|
||
|| this_dir[pdir_len] == '/'))
|
||
{
|
||
const char *subdir = NULL;
|
||
|
||
std::string subdir_holder;
|
||
if (this_dir[pdir_len] == '/')
|
||
{
|
||
subdir_holder = std::string (this_dir + pdir_len + 1);
|
||
subdir = subdir_holder.c_str ();
|
||
}
|
||
rc = try_thread_db_load_from_pdir (subdir);
|
||
if (rc)
|
||
break;
|
||
}
|
||
else if (strcmp (this_dir, "$sdir") == 0)
|
||
{
|
||
if (try_thread_db_load_from_sdir ())
|
||
{
|
||
rc = 1;
|
||
break;
|
||
}
|
||
}
|
||
else
|
||
{
|
||
if (try_thread_db_load_from_dir (this_dir, this_dir_len))
|
||
{
|
||
rc = 1;
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
|
||
if (libthread_db_debug)
|
||
fprintf_unfiltered (gdb_stdlog,
|
||
_("thread_db_load_search returning %d\n"), rc);
|
||
return rc;
|
||
}
|
||
|
||
/* Return non-zero if the inferior has a libpthread. */
|
||
|
||
static int
|
||
has_libpthread (void)
|
||
{
|
||
struct objfile *obj;
|
||
|
||
ALL_OBJFILES (obj)
|
||
if (libpthread_name_p (objfile_name (obj)))
|
||
return 1;
|
||
|
||
return 0;
|
||
}
|
||
|
||
/* Attempt to load and initialize libthread_db.
|
||
Return 1 on success. */
|
||
|
||
static int
|
||
thread_db_load (void)
|
||
{
|
||
struct thread_db_info *info;
|
||
|
||
info = get_thread_db_info (ptid_get_pid (inferior_ptid));
|
||
|
||
if (info != NULL)
|
||
return 1;
|
||
|
||
/* Don't attempt to use thread_db on executables not running
|
||
yet. */
|
||
if (!target_has_registers)
|
||
return 0;
|
||
|
||
/* Don't attempt to use thread_db for remote targets. */
|
||
if (!(target_can_run () || core_bfd))
|
||
return 0;
|
||
|
||
if (thread_db_load_search ())
|
||
return 1;
|
||
|
||
/* We couldn't find a libthread_db.
|
||
If the inferior has a libpthread warn the user. */
|
||
if (has_libpthread ())
|
||
{
|
||
warning (_("Unable to find libthread_db matching inferior's thread"
|
||
" library, thread debugging will not be available."));
|
||
return 0;
|
||
}
|
||
|
||
/* Either this executable isn't using libpthread at all, or it is
|
||
statically linked. Since we can't easily distinguish these two cases,
|
||
no warning is issued. */
|
||
return 0;
|
||
}
|
||
|
||
static void
|
||
check_thread_signals (void)
|
||
{
|
||
if (!thread_signals)
|
||
{
|
||
sigset_t mask;
|
||
int i;
|
||
|
||
lin_thread_get_thread_signals (&mask);
|
||
sigemptyset (&thread_stop_set);
|
||
sigemptyset (&thread_print_set);
|
||
|
||
for (i = 1; i < NSIG; i++)
|
||
{
|
||
if (sigismember (&mask, i))
|
||
{
|
||
if (signal_stop_update (gdb_signal_from_host (i), 0))
|
||
sigaddset (&thread_stop_set, i);
|
||
if (signal_print_update (gdb_signal_from_host (i), 0))
|
||
sigaddset (&thread_print_set, i);
|
||
thread_signals = 1;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
/* Check whether thread_db is usable. This function is called when
|
||
an inferior is created (or otherwise acquired, e.g. attached to)
|
||
and when new shared libraries are loaded into a running process. */
|
||
|
||
void
|
||
check_for_thread_db (void)
|
||
{
|
||
/* Do nothing if we couldn't load libthread_db.so.1. */
|
||
if (!thread_db_load ())
|
||
return;
|
||
}
|
||
|
||
/* This function is called via the new_objfile observer. */
|
||
|
||
static void
|
||
thread_db_new_objfile (struct objfile *objfile)
|
||
{
|
||
/* This observer must always be called with inferior_ptid set
|
||
correctly. */
|
||
|
||
if (objfile != NULL
|
||
/* libpthread with separate debug info has its debug info file already
|
||
loaded (and notified without successful thread_db initialization)
|
||
the time gdb::observers::new_objfile.notify is called for the library itself.
|
||
Static executables have their separate debug info loaded already
|
||
before the inferior has started. */
|
||
&& objfile->separate_debug_objfile_backlink == NULL
|
||
/* Only check for thread_db if we loaded libpthread,
|
||
or if this is the main symbol file.
|
||
We need to check OBJF_MAINLINE to handle the case of debugging
|
||
a statically linked executable AND the symbol file is specified AFTER
|
||
the exec file is loaded (e.g., gdb -c core ; file foo).
|
||
For dynamically linked executables, libpthread can be near the end
|
||
of the list of shared libraries to load, and in an app of several
|
||
thousand shared libraries, this can otherwise be painful. */
|
||
&& ((objfile->flags & OBJF_MAINLINE) != 0
|
||
|| libpthread_name_p (objfile_name (objfile))))
|
||
check_for_thread_db ();
|
||
}
|
||
|
||
static void
|
||
check_pid_namespace_match (void)
|
||
{
|
||
/* Check is only relevant for local targets targets. */
|
||
if (target_can_run ())
|
||
{
|
||
/* If the child is in a different PID namespace, its idea of its
|
||
PID will differ from our idea of its PID. When we scan the
|
||
child's thread list, we'll mistakenly think it has no threads
|
||
since the thread PID fields won't match the PID we give to
|
||
libthread_db. */
|
||
if (!linux_ns_same (ptid_get_pid (inferior_ptid), LINUX_NS_PID))
|
||
{
|
||
warning (_ ("Target and debugger are in different PID "
|
||
"namespaces; thread lists and other data are "
|
||
"likely unreliable. "
|
||
"Connect to gdbserver inside the container."));
|
||
}
|
||
}
|
||
}
|
||
|
||
/* This function is called via the inferior_created observer.
|
||
This handles the case of debugging statically linked executables. */
|
||
|
||
static void
|
||
thread_db_inferior_created (struct target_ops *target, int from_tty)
|
||
{
|
||
check_pid_namespace_match ();
|
||
check_for_thread_db ();
|
||
}
|
||
|
||
/* Update the thread's state (what's displayed in "info threads"),
|
||
from libthread_db thread state information. */
|
||
|
||
static void
|
||
update_thread_state (thread_db_thread_info *priv,
|
||
const td_thrinfo_t *ti_p)
|
||
{
|
||
priv->dying = (ti_p->ti_state == TD_THR_UNKNOWN
|
||
|| ti_p->ti_state == TD_THR_ZOMBIE);
|
||
}
|
||
|
||
/* Record a new thread in GDB's thread list. Creates the thread's
|
||
private info. If TP is NULL or TP is marked as having exited,
|
||
creates a new thread. Otherwise, uses TP. */
|
||
|
||
static struct thread_info *
|
||
record_thread (struct thread_db_info *info,
|
||
struct thread_info *tp,
|
||
ptid_t ptid, const td_thrhandle_t *th_p,
|
||
const td_thrinfo_t *ti_p)
|
||
{
|
||
/* A thread ID of zero may mean the thread library has not
|
||
initialized yet. Leave private == NULL until the thread library
|
||
has initialized. */
|
||
if (ti_p->ti_tid == 0)
|
||
return tp;
|
||
|
||
/* Construct the thread's private data. */
|
||
thread_db_thread_info *priv = new thread_db_thread_info;
|
||
|
||
priv->th = *th_p;
|
||
priv->tid = ti_p->ti_tid;
|
||
update_thread_state (priv, ti_p);
|
||
|
||
/* Add the thread to GDB's thread list. If we already know about a
|
||
thread with this PTID, but it's marked exited, then the kernel
|
||
reused the tid of an old thread. */
|
||
if (tp == NULL || tp->state == THREAD_EXITED)
|
||
tp = add_thread_with_info (ptid, priv);
|
||
else
|
||
tp->priv.reset (priv);
|
||
|
||
if (target_has_execution)
|
||
check_thread_signals ();
|
||
|
||
return tp;
|
||
}
|
||
|
||
void
|
||
thread_db_target::detach (inferior *inf, int from_tty)
|
||
{
|
||
struct target_ops *target_beneath = find_target_beneath (this);
|
||
|
||
delete_thread_db_info (inf->pid);
|
||
|
||
target_beneath->detach (inf, from_tty);
|
||
|
||
/* NOTE: From this point on, inferior_ptid is null_ptid. */
|
||
|
||
/* If there are no more processes using libpthread, detach the
|
||
thread_db target ops. */
|
||
if (!thread_db_list)
|
||
unpush_target (this);
|
||
}
|
||
|
||
ptid_t
|
||
thread_db_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
|
||
int options)
|
||
{
|
||
struct thread_db_info *info;
|
||
struct target_ops *beneath = find_target_beneath (this);
|
||
|
||
ptid = beneath->wait (ptid, ourstatus, options);
|
||
|
||
switch (ourstatus->kind)
|
||
{
|
||
case TARGET_WAITKIND_IGNORE:
|
||
case TARGET_WAITKIND_EXITED:
|
||
case TARGET_WAITKIND_THREAD_EXITED:
|
||
case TARGET_WAITKIND_SIGNALLED:
|
||
return ptid;
|
||
}
|
||
|
||
info = get_thread_db_info (ptid_get_pid (ptid));
|
||
|
||
/* If this process isn't using thread_db, we're done. */
|
||
if (info == NULL)
|
||
return ptid;
|
||
|
||
if (ourstatus->kind == TARGET_WAITKIND_EXECD)
|
||
{
|
||
/* New image, it may or may not end up using thread_db. Assume
|
||
not unless we find otherwise. */
|
||
delete_thread_db_info (ptid_get_pid (ptid));
|
||
if (!thread_db_list)
|
||
unpush_target (&the_thread_db_target);
|
||
|
||
return ptid;
|
||
}
|
||
|
||
/* Fill in the thread's user-level thread id and status. */
|
||
thread_from_lwp (ptid);
|
||
|
||
return ptid;
|
||
}
|
||
|
||
void
|
||
thread_db_target::mourn_inferior ()
|
||
{
|
||
struct target_ops *target_beneath = find_target_beneath (this);
|
||
|
||
delete_thread_db_info (ptid_get_pid (inferior_ptid));
|
||
|
||
target_beneath->mourn_inferior ();
|
||
|
||
/* Detach thread_db target ops. */
|
||
if (!thread_db_list)
|
||
unpush_target (&the_thread_db_target);
|
||
}
|
||
|
||
struct callback_data
|
||
{
|
||
struct thread_db_info *info;
|
||
int new_threads;
|
||
};
|
||
|
||
static int
|
||
find_new_threads_callback (const td_thrhandle_t *th_p, void *data)
|
||
{
|
||
td_thrinfo_t ti;
|
||
td_err_e err;
|
||
ptid_t ptid;
|
||
struct thread_info *tp;
|
||
struct callback_data *cb_data = (struct callback_data *) data;
|
||
struct thread_db_info *info = cb_data->info;
|
||
|
||
err = info->td_thr_get_info_p (th_p, &ti);
|
||
if (err != TD_OK)
|
||
error (_("find_new_threads_callback: cannot get thread info: %s"),
|
||
thread_db_err_str (err));
|
||
|
||
if (ti.ti_lid == -1)
|
||
{
|
||
/* A thread with kernel thread ID -1 is either a thread that
|
||
exited and was joined, or a thread that is being created but
|
||
hasn't started yet, and that is reusing the tcb/stack of a
|
||
thread that previously exited and was joined. (glibc marks
|
||
terminated and joined threads with kernel thread ID -1. See
|
||
glibc PR17707. */
|
||
if (libthread_db_debug)
|
||
fprintf_unfiltered (gdb_stdlog,
|
||
"thread_db: skipping exited and "
|
||
"joined thread (0x%lx)\n",
|
||
(unsigned long) ti.ti_tid);
|
||
return 0;
|
||
}
|
||
|
||
if (ti.ti_tid == 0)
|
||
{
|
||
/* A thread ID of zero means that this is the main thread, but
|
||
glibc has not yet initialized thread-local storage and the
|
||
pthread library. We do not know what the thread's TID will
|
||
be yet. */
|
||
|
||
/* In that case, we're not stopped in a fork syscall and don't
|
||
need this glibc bug workaround. */
|
||
info->need_stale_parent_threads_check = 0;
|
||
|
||
return 0;
|
||
}
|
||
|
||
/* Ignore stale parent threads, caused by glibc/BZ5983. This is a
|
||
bit expensive, as it needs to open /proc/pid/status, so try to
|
||
avoid doing the work if we know we don't have to. */
|
||
if (info->need_stale_parent_threads_check)
|
||
{
|
||
int tgid = linux_proc_get_tgid (ti.ti_lid);
|
||
|
||
if (tgid != -1 && tgid != info->pid)
|
||
return 0;
|
||
}
|
||
|
||
ptid = ptid_build (info->pid, ti.ti_lid, 0);
|
||
tp = find_thread_ptid (ptid);
|
||
if (tp == NULL || tp->priv == NULL)
|
||
record_thread (info, tp, ptid, th_p, &ti);
|
||
|
||
return 0;
|
||
}
|
||
|
||
/* Helper for thread_db_find_new_threads_2.
|
||
Returns number of new threads found. */
|
||
|
||
static int
|
||
find_new_threads_once (struct thread_db_info *info, int iteration,
|
||
td_err_e *errp)
|
||
{
|
||
struct callback_data data;
|
||
td_err_e err = TD_ERR;
|
||
|
||
data.info = info;
|
||
data.new_threads = 0;
|
||
|
||
/* See comment in thread_db_update_thread_list. */
|
||
gdb_assert (info->td_ta_thr_iter_p != NULL);
|
||
|
||
TRY
|
||
{
|
||
/* Iterate over all user-space threads to discover new threads. */
|
||
err = info->td_ta_thr_iter_p (info->thread_agent,
|
||
find_new_threads_callback,
|
||
&data,
|
||
TD_THR_ANY_STATE,
|
||
TD_THR_LOWEST_PRIORITY,
|
||
TD_SIGNO_MASK,
|
||
TD_THR_ANY_USER_FLAGS);
|
||
}
|
||
CATCH (except, RETURN_MASK_ERROR)
|
||
{
|
||
if (libthread_db_debug)
|
||
{
|
||
exception_fprintf (gdb_stdlog, except,
|
||
"Warning: find_new_threads_once: ");
|
||
}
|
||
}
|
||
END_CATCH
|
||
|
||
if (libthread_db_debug)
|
||
{
|
||
fprintf_unfiltered (gdb_stdlog,
|
||
_("Found %d new threads in iteration %d.\n"),
|
||
data.new_threads, iteration);
|
||
}
|
||
|
||
if (errp != NULL)
|
||
*errp = err;
|
||
|
||
return data.new_threads;
|
||
}
|
||
|
||
/* Search for new threads, accessing memory through stopped thread
|
||
PTID. If UNTIL_NO_NEW is true, repeat searching until several
|
||
searches in a row do not discover any new threads. */
|
||
|
||
static void
|
||
thread_db_find_new_threads_2 (ptid_t ptid, int until_no_new)
|
||
{
|
||
td_err_e err = TD_OK;
|
||
struct thread_db_info *info;
|
||
int i, loop;
|
||
|
||
info = get_thread_db_info (ptid_get_pid (ptid));
|
||
|
||
/* Access an lwp we know is stopped. */
|
||
info->proc_handle.ptid = ptid;
|
||
|
||
if (until_no_new)
|
||
{
|
||
/* Require 4 successive iterations which do not find any new threads.
|
||
The 4 is a heuristic: there is an inherent race here, and I have
|
||
seen that 2 iterations in a row are not always sufficient to
|
||
"capture" all threads. */
|
||
for (i = 0, loop = 0; loop < 4 && err == TD_OK; ++i, ++loop)
|
||
if (find_new_threads_once (info, i, &err) != 0)
|
||
{
|
||
/* Found some new threads. Restart the loop from beginning. */
|
||
loop = -1;
|
||
}
|
||
}
|
||
else
|
||
find_new_threads_once (info, 0, &err);
|
||
|
||
if (err != TD_OK)
|
||
error (_("Cannot find new threads: %s"), thread_db_err_str (err));
|
||
}
|
||
|
||
static void
|
||
thread_db_find_new_threads_1 (ptid_t ptid)
|
||
{
|
||
thread_db_find_new_threads_2 (ptid, 0);
|
||
}
|
||
|
||
/* Implement the to_update_thread_list target method for this
|
||
target. */
|
||
|
||
void
|
||
thread_db_target::update_thread_list ()
|
||
{
|
||
struct thread_db_info *info;
|
||
struct inferior *inf;
|
||
|
||
prune_threads ();
|
||
|
||
ALL_INFERIORS (inf)
|
||
{
|
||
struct thread_info *thread;
|
||
|
||
if (inf->pid == 0)
|
||
continue;
|
||
|
||
info = get_thread_db_info (inf->pid);
|
||
if (info == NULL)
|
||
continue;
|
||
|
||
thread = any_live_thread_of_process (inf->pid);
|
||
if (thread == NULL || thread->executing)
|
||
continue;
|
||
|
||
/* It's best to avoid td_ta_thr_iter if possible. That walks
|
||
data structures in the inferior's address space that may be
|
||
corrupted, or, if the target is running, the list may change
|
||
while we walk it. In the latter case, it's possible that a
|
||
thread exits just at the exact time that causes GDB to get
|
||
stuck in an infinite loop. To avoid pausing all threads
|
||
whenever the core wants to refresh the thread list, we
|
||
instead use thread_from_lwp immediately when we see an LWP
|
||
stop. That uses thread_db entry points that do not walk
|
||
libpthread's thread list, so should be safe, as well as more
|
||
efficient. */
|
||
if (target_has_execution_1 (thread->ptid))
|
||
continue;
|
||
|
||
thread_db_find_new_threads_1 (thread->ptid);
|
||
}
|
||
|
||
/* Give the beneath target a chance to do extra processing. */
|
||
this->beneath->update_thread_list ();
|
||
}
|
||
|
||
const char *
|
||
thread_db_target::pid_to_str (ptid_t ptid)
|
||
{
|
||
struct thread_info *thread_info = find_thread_ptid (ptid);
|
||
struct target_ops *beneath;
|
||
|
||
if (thread_info != NULL && thread_info->priv != NULL)
|
||
{
|
||
static char buf[64];
|
||
thread_db_thread_info *priv = get_thread_db_thread_info (thread_info);
|
||
|
||
snprintf (buf, sizeof (buf), "Thread 0x%lx (LWP %ld)",
|
||
(unsigned long) priv->tid, ptid_get_lwp (ptid));
|
||
|
||
return buf;
|
||
}
|
||
|
||
beneath = find_target_beneath (this);
|
||
return beneath->pid_to_str (ptid);
|
||
}
|
||
|
||
/* Return a string describing the state of the thread specified by
|
||
INFO. */
|
||
|
||
const char *
|
||
thread_db_target::extra_thread_info (thread_info *info)
|
||
{
|
||
if (info->priv == NULL)
|
||
return NULL;
|
||
|
||
thread_db_thread_info *priv = get_thread_db_thread_info (info);
|
||
|
||
if (priv->dying)
|
||
return "Exiting";
|
||
|
||
return NULL;
|
||
}
|
||
|
||
/* Return pointer to the thread_info struct which corresponds to
|
||
THREAD_HANDLE (having length HANDLE_LEN). */
|
||
|
||
thread_info *
|
||
thread_db_target::thread_handle_to_thread_info (const gdb_byte *thread_handle,
|
||
int handle_len,
|
||
inferior *inf)
|
||
{
|
||
struct thread_info *tp;
|
||
thread_t handle_tid;
|
||
|
||
/* Thread handle sizes must match in order to proceed. We don't use an
|
||
assert here because the resulting internal error will cause GDB to
|
||
exit. This isn't necessarily an internal error due to the possibility
|
||
of garbage being passed as the thread handle via the python interface. */
|
||
if (handle_len != sizeof (handle_tid))
|
||
error (_("Thread handle size mismatch: %d vs %zu (from libthread_db)"),
|
||
handle_len, sizeof (handle_tid));
|
||
|
||
handle_tid = * (const thread_t *) thread_handle;
|
||
|
||
ALL_NON_EXITED_THREADS (tp)
|
||
{
|
||
thread_db_thread_info *priv = get_thread_db_thread_info (tp);
|
||
|
||
if (tp->inf == inf && priv != NULL && handle_tid == priv->tid)
|
||
return tp;
|
||
}
|
||
|
||
return NULL;
|
||
}
|
||
|
||
/* Get the address of the thread local variable in load module LM which
|
||
is stored at OFFSET within the thread local storage for thread PTID. */
|
||
|
||
CORE_ADDR
|
||
thread_db_target::get_thread_local_address (ptid_t ptid,
|
||
CORE_ADDR lm,
|
||
CORE_ADDR offset)
|
||
{
|
||
struct thread_info *thread_info;
|
||
struct target_ops *beneath;
|
||
|
||
/* Find the matching thread. */
|
||
thread_info = find_thread_ptid (ptid);
|
||
|
||
/* We may not have discovered the thread yet. */
|
||
if (thread_info != NULL && thread_info->priv == NULL)
|
||
thread_info = thread_from_lwp (ptid);
|
||
|
||
if (thread_info != NULL && thread_info->priv != NULL)
|
||
{
|
||
td_err_e err;
|
||
psaddr_t address;
|
||
thread_db_info *info = get_thread_db_info (ptid_get_pid (ptid));
|
||
thread_db_thread_info *priv = get_thread_db_thread_info (thread_info);
|
||
|
||
/* Finally, get the address of the variable. */
|
||
if (lm != 0)
|
||
{
|
||
/* glibc doesn't provide the needed interface. */
|
||
if (!info->td_thr_tls_get_addr_p)
|
||
throw_error (TLS_NO_LIBRARY_SUPPORT_ERROR,
|
||
_("No TLS library support"));
|
||
|
||
/* Note the cast through uintptr_t: this interface only works if
|
||
a target address fits in a psaddr_t, which is a host pointer.
|
||
So a 32-bit debugger can not access 64-bit TLS through this. */
|
||
err = info->td_thr_tls_get_addr_p (&priv->th,
|
||
(psaddr_t)(uintptr_t) lm,
|
||
offset, &address);
|
||
}
|
||
else
|
||
{
|
||
/* If glibc doesn't provide the needed interface throw an error
|
||
that LM is zero - normally cases it should not be. */
|
||
if (!info->td_thr_tlsbase_p)
|
||
throw_error (TLS_LOAD_MODULE_NOT_FOUND_ERROR,
|
||
_("TLS load module not found"));
|
||
|
||
/* This code path handles the case of -static -pthread executables:
|
||
https://sourceware.org/ml/libc-help/2014-03/msg00024.html
|
||
For older GNU libc r_debug.r_map is NULL. For GNU libc after
|
||
PR libc/16831 due to GDB PR threads/16954 LOAD_MODULE is also NULL.
|
||
The constant number 1 depends on GNU __libc_setup_tls
|
||
initialization of l_tls_modid to 1. */
|
||
err = info->td_thr_tlsbase_p (&priv->th, 1, &address);
|
||
address = (char *) address + offset;
|
||
}
|
||
|
||
#ifdef THREAD_DB_HAS_TD_NOTALLOC
|
||
/* The memory hasn't been allocated, yet. */
|
||
if (err == TD_NOTALLOC)
|
||
/* Now, if libthread_db provided the initialization image's
|
||
address, we *could* try to build a non-lvalue value from
|
||
the initialization image. */
|
||
throw_error (TLS_NOT_ALLOCATED_YET_ERROR,
|
||
_("TLS not allocated yet"));
|
||
#endif
|
||
|
||
/* Something else went wrong. */
|
||
if (err != TD_OK)
|
||
throw_error (TLS_GENERIC_ERROR,
|
||
(("%s")), thread_db_err_str (err));
|
||
|
||
/* Cast assuming host == target. Joy. */
|
||
/* Do proper sign extension for the target. */
|
||
gdb_assert (exec_bfd);
|
||
return (bfd_get_sign_extend_vma (exec_bfd) > 0
|
||
? (CORE_ADDR) (intptr_t) address
|
||
: (CORE_ADDR) (uintptr_t) address);
|
||
}
|
||
|
||
beneath = find_target_beneath (this);
|
||
return beneath->get_thread_local_address (ptid, lm, offset);
|
||
}
|
||
|
||
/* Implement the to_get_ada_task_ptid target method for this target. */
|
||
|
||
ptid_t
|
||
thread_db_target::get_ada_task_ptid (long lwp, long thread)
|
||
{
|
||
/* NPTL uses a 1:1 model, so the LWP id suffices. */
|
||
return ptid_build (ptid_get_pid (inferior_ptid), lwp, 0);
|
||
}
|
||
|
||
void
|
||
thread_db_target::resume (ptid_t ptid, int step, enum gdb_signal signo)
|
||
{
|
||
struct target_ops *beneath = find_target_beneath (this);
|
||
struct thread_db_info *info;
|
||
|
||
if (ptid_equal (ptid, minus_one_ptid))
|
||
info = get_thread_db_info (ptid_get_pid (inferior_ptid));
|
||
else
|
||
info = get_thread_db_info (ptid_get_pid (ptid));
|
||
|
||
/* This workaround is only needed for child fork lwps stopped in a
|
||
PTRACE_O_TRACEFORK event. When the inferior is resumed, the
|
||
workaround can be disabled. */
|
||
if (info)
|
||
info->need_stale_parent_threads_check = 0;
|
||
|
||
beneath->resume (ptid, step, signo);
|
||
}
|
||
|
||
/* std::sort helper function for info_auto_load_libthread_db, sort the
|
||
thread_db_info pointers primarily by their FILENAME and secondarily by their
|
||
PID, both in ascending order. */
|
||
|
||
static bool
|
||
info_auto_load_libthread_db_compare (const struct thread_db_info *a,
|
||
const struct thread_db_info *b)
|
||
{
|
||
int retval;
|
||
|
||
retval = strcmp (a->filename, b->filename);
|
||
if (retval)
|
||
return retval < 0;
|
||
|
||
return a->pid < b->pid;
|
||
}
|
||
|
||
/* Implement 'info auto-load libthread-db'. */
|
||
|
||
static void
|
||
info_auto_load_libthread_db (const char *args, int from_tty)
|
||
{
|
||
struct ui_out *uiout = current_uiout;
|
||
const char *cs = args ? args : "";
|
||
struct thread_db_info *info;
|
||
unsigned unique_filenames;
|
||
size_t max_filename_len, pids_len;
|
||
int i;
|
||
|
||
cs = skip_spaces (cs);
|
||
if (*cs)
|
||
error (_("'info auto-load libthread-db' does not accept any parameters"));
|
||
|
||
std::vector<struct thread_db_info *> array;
|
||
for (info = thread_db_list; info; info = info->next)
|
||
if (info->filename != NULL)
|
||
array.push_back (info);
|
||
|
||
/* Sort ARRAY by filenames and PIDs. */
|
||
std::sort (array.begin (), array.end (),
|
||
info_auto_load_libthread_db_compare);
|
||
|
||
/* Calculate the number of unique filenames (rows) and the maximum string
|
||
length of PIDs list for the unique filenames (columns). */
|
||
|
||
unique_filenames = 0;
|
||
max_filename_len = 0;
|
||
pids_len = 0;
|
||
for (i = 0; i < array.size (); i++)
|
||
{
|
||
int pid = array[i]->pid;
|
||
size_t this_pid_len;
|
||
|
||
for (this_pid_len = 0; pid != 0; pid /= 10)
|
||
this_pid_len++;
|
||
|
||
if (i == 0 || strcmp (array[i - 1]->filename, array[i]->filename) != 0)
|
||
{
|
||
unique_filenames++;
|
||
max_filename_len = std::max (max_filename_len,
|
||
strlen (array[i]->filename));
|
||
|
||
if (i > 0)
|
||
pids_len -= strlen (", ");
|
||
pids_len = 0;
|
||
}
|
||
pids_len += this_pid_len + strlen (", ");
|
||
}
|
||
if (i)
|
||
pids_len -= strlen (", ");
|
||
|
||
/* Table header shifted right by preceding "libthread-db: " would not match
|
||
its columns. */
|
||
if (array.size () > 0 && args == auto_load_info_scripts_pattern_nl)
|
||
uiout->text ("\n");
|
||
|
||
{
|
||
ui_out_emit_table table_emitter (uiout, 2, unique_filenames,
|
||
"LinuxThreadDbTable");
|
||
|
||
uiout->table_header (max_filename_len, ui_left, "filename", "Filename");
|
||
uiout->table_header (pids_len, ui_left, "PIDs", "Pids");
|
||
uiout->table_body ();
|
||
|
||
/* Note I is incremented inside the cycle, not at its end. */
|
||
for (i = 0; i < array.size ();)
|
||
{
|
||
ui_out_emit_tuple tuple_emitter (uiout, NULL);
|
||
|
||
info = array[i];
|
||
uiout->field_string ("filename", info->filename);
|
||
|
||
std::string pids;
|
||
while (i < array.size () && strcmp (info->filename,
|
||
array[i]->filename) == 0)
|
||
{
|
||
if (!pids.empty ())
|
||
pids += ", ";
|
||
string_appendf (pids, "%u", array[i]->pid);
|
||
i++;
|
||
}
|
||
|
||
uiout->field_string ("pids", pids.c_str ());
|
||
|
||
uiout->text ("\n");
|
||
}
|
||
}
|
||
|
||
if (array.empty ())
|
||
uiout->message (_("No auto-loaded libthread-db.\n"));
|
||
}
|
||
|
||
void
|
||
_initialize_thread_db (void)
|
||
{
|
||
/* Defer loading of libthread_db.so until inferior is running.
|
||
This allows gdb to load correct libthread_db for a given
|
||
executable -- there could be multiple versions of glibc,
|
||
and until there is a running inferior, we can't tell which
|
||
libthread_db is the correct one to load. */
|
||
|
||
libthread_db_search_path = xstrdup (LIBTHREAD_DB_SEARCH_PATH);
|
||
|
||
add_setshow_optional_filename_cmd ("libthread-db-search-path",
|
||
class_support,
|
||
&libthread_db_search_path, _("\
|
||
Set search path for libthread_db."), _("\
|
||
Show the current search path or libthread_db."), _("\
|
||
This path is used to search for libthread_db to be loaded into \
|
||
gdb itself.\n\
|
||
Its value is a colon (':') separate list of directories to search.\n\
|
||
Setting the search path to an empty list resets it to its default value."),
|
||
set_libthread_db_search_path,
|
||
NULL,
|
||
&setlist, &showlist);
|
||
|
||
add_setshow_zuinteger_cmd ("libthread-db", class_maintenance,
|
||
&libthread_db_debug, _("\
|
||
Set libthread-db debugging."), _("\
|
||
Show libthread-db debugging."), _("\
|
||
When non-zero, libthread-db debugging is enabled."),
|
||
NULL,
|
||
show_libthread_db_debug,
|
||
&setdebuglist, &showdebuglist);
|
||
|
||
add_setshow_boolean_cmd ("libthread-db", class_support,
|
||
&auto_load_thread_db, _("\
|
||
Enable or disable auto-loading of inferior specific libthread_db."), _("\
|
||
Show whether auto-loading inferior specific libthread_db is enabled."), _("\
|
||
If enabled, libthread_db will be searched in 'set libthread-db-search-path'\n\
|
||
locations to load libthread_db compatible with the inferior.\n\
|
||
Standard system libthread_db still gets loaded even with this option off.\n\
|
||
This options has security implications for untrusted inferiors."),
|
||
NULL, show_auto_load_thread_db,
|
||
auto_load_set_cmdlist_get (),
|
||
auto_load_show_cmdlist_get ());
|
||
|
||
add_cmd ("libthread-db", class_info, info_auto_load_libthread_db,
|
||
_("Print the list of loaded inferior specific libthread_db.\n\
|
||
Usage: info auto-load libthread-db"),
|
||
auto_load_info_cmdlist_get ());
|
||
|
||
/* Add ourselves to objfile event chain. */
|
||
gdb::observers::new_objfile.attach (thread_db_new_objfile);
|
||
|
||
/* Add ourselves to inferior_created event chain.
|
||
This is needed to handle debugging statically linked programs where
|
||
the new_objfile observer won't get called for libpthread. */
|
||
gdb::observers::inferior_created.attach (thread_db_inferior_created);
|
||
}
|