Skip to content

Commit 5b6d1e4

Browse files
committed
Multi-target support
This commit adds multi-target support to GDB. What this means is that with this commit, GDB can now be connected to different targets at the same time. E.g., you can debug a live native process and a core dump at the same time, connect to multiple gdbservers, etc. Actually, the word "target" is overloaded in gdb. We already have a target stack, with pushes several target_ops instances on top of one another. We also have "info target" already, which means something completely different to what this patch does. So from here on, I'll be using the "target connections" term, to mean an open process_stratum target, pushed on a target stack. This patch makes gdb have multiple target stacks, and multiple process_stratum targets open simultaneously. The user-visible changes / commands will also use this terminology, but of course it's all open to debate. User-interface-wise, not that much changes. The main difference is that each inferior may have its own target connection. A target connection (e.g., a target extended-remote connection) may support debugging multiple processes, just as before. Say you're debugging against gdbserver in extended-remote mode, and you do "add-inferior" to prepare to spawn a new process, like: (gdb) target extended-remote :9999 ... (gdb) start ... (gdb) add-inferior Added inferior 2 (gdb) inferior 2 [Switching to inferior 2 [<null>] (<noexec>)] (gdb) file a.out ... (gdb) start ... At this point, you have two inferiors connected to the same gdbserver. With this commit, GDB will maintain a target stack per inferior, instead of a global target stack. To preserve the behavior above, by default, "add-inferior" makes the new inferior inherit a copy of the target stack of the current inferior. Same across a fork - the child inherits a copy of the target stack of the parent. While the target stacks are copied, the targets themselves are not. Instead, target_ops is made a refcounted_object, which means that target_ops instances are refcounted, which each inferior counting for a reference. What if you want to create an inferior and connect it to some _other_ target? For that, this commit introduces a new "add-inferior -no-connection" option that makes the new inferior not share the current inferior's target. So you could do: (gdb) target extended-remote :9999 Remote debugging using :9999 ... (gdb) add-inferior -no-connection [New inferior 2] Added inferior 2 (gdb) inferior 2 [Switching to inferior 2 [<null>] (<noexec>)] (gdb) info inferiors Num Description Executable 1 process 18401 target:/home/pedro/tmp/main * 2 <null> (gdb) tar extended-remote :10000 Remote debugging using :10000 ... (gdb) info inferiors Num Description Executable 1 process 18401 target:/home/pedro/tmp/main * 2 process 18450 target:/home/pedro/tmp/main (gdb) A following patch will extended "info inferiors" to include a column indicating which connection an inferior is bound to, along with a couple other UI tweaks. Other than that, debugging is the same as before. Users interact with inferiors and threads as before. The only difference is that inferiors may be bound to processes running in different machines. That's pretty much all there is to it in terms of noticeable UI changes. On to implementation. Since we can be connected to different systems at the same time, a ptid_t is no longer a unique identifier. Instead a thread can be identified by a pair of ptid_t and 'process_stratum_target *', the later being the instance of the process_stratum target that owns the process/thread. Note that process_stratum_target inherits from target_ops, and all process_stratum targets inherit from process_stratum_target. In earlier patches, many places in gdb were converted to refer to threads by thread_info pointer instead of ptid_t, but there are still places in gdb where we start with a pid/tid and need to find the corresponding inferior or thread_info objects. So you'll see in the patch many places adding a process_stratum_target parameter to functions that used to take only a ptid_t. Since each inferior has its own target stack now, we can always find the process_stratum target for an inferior. That is done via a inf->process_target() convenience method. Since each inferior has its own target stack, we need to handle the "beneath" calls when servicing target calls. The solution I settled with is just to make sure to switch the current inferior to the inferior you want before making a target call. Not relying on global context is just not feasible in current GDB. Fortunately, there aren't that many places that need to do that, because generally most code that calls target methods already has the current context pointing to the right inferior/thread. Note, to emphasize -- there's no method to "switch to this target stack". Instead, you switch the current inferior, and that implicitly switches the target stack. In some spots, we need to iterate over all inferiors so that we reach all target stacks. Native targets are still singletons. There's always only a single instance of such targets. Remote targets however, we'll have one instance per remote connection. The exec target is still a singleton. There's only one instance. I did not see the point of instanciating more than one exec_target object. After vfork, we need to make sure to push the exec target on the new inferior. See exec_on_vfork. For type safety, functions that need a {target, ptid} pair to identify a thread, take a process_stratum_target pointer for target parameter instead of target_ops *. Some shared code in gdb/nat/ also need to gain a target pointer parameter. This poses an issue, since gdbserver doesn't have process_stratum_target, only target_ops. To fix this, this commit renames gdbserver's target_ops to process_stratum_target. I think this makes sense. There's no concept of target stack in gdbserver, and gdbserver's target_ops really implements a process_stratum-like target. The thread and inferior iterator functions also gain process_stratum_target parameters. These are used to be able to iterate over threads and inferiors of a given target. Following usual conventions, if the target pointer is null, then we iterate over threads and inferiors of all targets. I tried converting "add-inferior" to the gdb::option framework, as a preparatory patch, but that stumbled on the fact that gdb::option does not support file options yet, for "add-inferior -exec". I have a WIP patchset that adds that, but it's not a trivial patch, mainly due to need to integrate readline's filename completion, so I deferred that to some other time. In infrun.c/infcmd.c, the main change is that we need to poll events out of all targets. See do_target_wait. Right after collecting an event, we switch the current inferior to an inferior bound to the target that reported the event, so that target methods can be used while handling the event. This makes most of the code transparent to multi-targets. See fetch_inferior_event. infrun.c:stop_all_threads is interesting -- in this function we need to stop all threads of all targets. What the function does is send an asynchronous stop request to all threads, and then synchronously waits for events, with target_wait, rinse repeat, until all it finds are stopped threads. Now that we have multiple targets, it's not efficient to synchronously block in target_wait waiting for events out of one target. Instead, we implement a mini event loop, with interruptible_select, select'ing on one file descriptor per target. For this to work, we need to be able to ask the target for a waitable file descriptor. Such file descriptors already exist, they are the descriptors registered in the main event loop with add_file_handler, inside the target_async implementations. This commit adds a new target_async_wait_fd target method that just returns the file descriptor in question. See wait_one / stop_all_threads in infrun.c. The 'threads_executing' global is made a per-target variable. Since it is only relevant to process_stratum_target targets, this is where it is put, instead of in target_ops. You'll notice that remote.c includes some FIXME notes. These refer to the fact that the global arrays that hold data for the remote packets supported are still globals. For example, if we connect to two different servers/stubs, then each might support different remote protocol features. They might even be different architectures, like e.g., one ARM baremetal stub, and a x86 gdbserver, to debug a host/controller scenario as a single program. That isn't going to work correctly today, because of said globals. I'm leaving fixing that for another pass, since it does not appear to be trivial, and I'd rather land the base work first. It's already useful to be able to debug multiple instances of the same server (e.g., a distributed cluster, where you have full control over the servers installed), so I think as is it's already reasonable incremental progress. Current limitations: - You can only resume more that one target at the same time if all targets support asynchronous debugging, and support non-stop mode. It should be possible to support mixed all-stop + non-stop backends, but that is left for another time. This means that currently in order to do multi-target with gdbserver you need to issue "maint set target-non-stop on". I would like to make that mode be the default, but we're not there yet. Note that I'm talking about how the target backend works, only. User-visible all-stop mode works just fine. - As explained above, connecting to different remote servers at the same time is likely to produce bad results if they don't support the exact set of RSP features. FreeBSD updates courtesy of John Baldwin. gdb/ChangeLog: 2020-01-10 Pedro Alves <[email protected]> John Baldwin <[email protected]> * aarch64-linux-nat.c (aarch64_linux_nat_target::thread_architecture): Adjust. * ada-tasks.c (print_ada_task_info): Adjust find_thread_ptid call. (task_command_1): Likewise. * aix-thread.c (sync_threadlists, aix_thread_target::resume) (aix_thread_target::wait, aix_thread_target::fetch_registers) (aix_thread_target::store_registers) (aix_thread_target::thread_alive): Adjust. * amd64-fbsd-tdep.c: Include "inferior.h". (amd64fbsd_get_thread_local_address): Pass down target. * amd64-linux-nat.c (ps_get_thread_area): Use ps_prochandle thread's gdbarch instead of target_gdbarch. * break-catch-sig.c (signal_catchpoint_print_it): Adjust call to get_last_target_status. * break-catch-syscall.c (print_it_catch_syscall): Likewise. * breakpoint.c (breakpoints_should_be_inserted_now): Consider all inferiors. (update_inserted_breakpoint_locations): Skip if inferiors with no execution. (update_global_location_list): When handling moribund locations, find representative inferior for location's pspace, and use thread count of its process_stratum target. * bsd-kvm.c (bsd_kvm_target_open): Pass target down. * bsd-uthread.c (bsd_uthread_target::wait): Use as_process_stratum_target and adjust thread_change_ptid and add_thread calls. (bsd_uthread_target::update_thread_list): Use as_process_stratum_target and adjust find_thread_ptid, thread_change_ptid and add_thread calls. * btrace.c (maint_btrace_packet_history_cmd): Adjust find_thread_ptid call. * corelow.c (add_to_thread_list): Adjust add_thread call. (core_target_open): Adjust add_thread_silent and thread_count calls. (core_target::pid_to_str): Adjust find_inferior_ptid call. * ctf.c (ctf_target_open): Adjust add_thread_silent call. * event-top.c (async_disconnect): Pop targets from all inferiors. * exec.c (add_target_sections): Push exec target on all inferiors sharing the program space. (remove_target_sections): Remove the exec target from all inferiors sharing the program space. (exec_on_vfork): New. * exec.h (exec_on_vfork): Declare. * fbsd-nat.c (fbsd_add_threads): Add fbsd_nat_target parameter. Pass it down. (fbsd_nat_target::update_thread_list): Adjust. (fbsd_nat_target::resume): Adjust. (fbsd_handle_debug_trap): Add fbsd_nat_target parameter. Pass it down. (fbsd_nat_target::wait, fbsd_nat_target::post_attach): Adjust. * fbsd-tdep.c (fbsd_corefile_thread): Adjust get_thread_arch_regcache call. * fork-child.c (gdb_startup_inferior): Pass target down to startup_inferior and set_executing. * gdbthread.h (struct process_stratum_target): Forward declare. (add_thread, add_thread_silent, add_thread_with_info) (in_thread_list): Add process_stratum_target parameter. (find_thread_ptid(inferior*, ptid_t)): New overload. (find_thread_ptid, thread_change_ptid): Add process_stratum_target parameter. (all_threads()): Delete overload. (all_threads, all_non_exited_threads): Add process_stratum_target parameter. (all_threads_safe): Use brace initialization. (thread_count): Add process_stratum_target parameter. (set_resumed, set_running, set_stop_requested, set_executing) (threads_are_executing, finish_thread_state): Add process_stratum_target parameter. (switch_to_thread): Use is_current_thread. * i386-fbsd-tdep.c: Include "inferior.h". (i386fbsd_get_thread_local_address): Pass down target. * i386-linux-nat.c (i386_linux_nat_target::low_resume): Adjust. * inf-child.c (inf_child_target::maybe_unpush_target): Remove have_inferiors check. * inf-ptrace.c (inf_ptrace_target::create_inferior) (inf_ptrace_target::attach): Adjust. * infcall.c (run_inferior_call): Adjust. * infcmd.c (run_command_1): Pass target to scoped_finish_thread_state. (proceed_thread_callback): Skip inferiors with no execution. (continue_command): Rename 'all_threads' local to avoid hiding 'all_threads' function. Adjust get_last_target_status call. (prepare_one_step): Adjust set_running call. (signal_command): Use user_visible_resume_target. Compare thread pointers instead of inferior_ptid. (info_program_command): Adjust to pass down target. (attach_command): Mark target's 'thread_executing' flag. (stop_current_target_threads_ns): New, factored out from ... (interrupt_target_1): ... this. Switch inferior before making target calls. * inferior-iter.h (struct all_inferiors_iterator, struct all_inferiors_range) (struct all_inferiors_safe_range) (struct all_non_exited_inferiors_range): Filter on process_stratum_target too. Remove explicit. * inferior.c (inferior::inferior): Push dummy target on target stack. (find_inferior_pid, find_inferior_ptid, number_of_live_inferiors): Add process_stratum_target parameter, and pass it down. (have_live_inferiors): Adjust. (switch_to_inferior_and_push_target): New. (add_inferior_command, clone_inferior_command): Handle "-no-connection" parameter. Use switch_to_inferior_and_push_target. (_initialize_inferior): Mention "-no-connection" option in the help of "add-inferior" and "clone-inferior" commands. * inferior.h: Include "process-stratum-target.h". (interrupt_target_1): Use bool. (struct inferior) <push_target, unpush_target, target_is_pushed, find_target_beneath, top_target, process_target, target_at, m_stack>: New. (discard_all_inferiors): Delete. (find_inferior_pid, find_inferior_ptid, number_of_live_inferiors) (all_inferiors, all_non_exited_inferiors): Add process_stratum_target parameter. * infrun.c: Include "gdb_select.h" and <unordered_map>. (target_last_proc_target): New global. (follow_fork_inferior): Push target on new inferior. Pass target to add_thread_silent. Call exec_on_vfork. Handle target's reference count. (follow_fork): Adjust get_last_target_status call. Also consider target. (follow_exec): Push target on new inferior. (struct execution_control_state) <target>: New field. (user_visible_resume_target): New. (do_target_resume): Call target_async. (resume_1): Set target's threads_executing flag. Consider resume target. (commit_resume_all_targets): New. (proceed): Also consider resume target. Skip threads of inferiors with no execution. Commit resumtion in all targets. (start_remote): Pass current inferior to wait_for_inferior. (infrun_thread_stop_requested): Consider target as well. Pass thread_info pointer to clear_inline_frame_state instead of ptid. (infrun_thread_thread_exit): Consider target as well. (random_pending_event_thread): New inferior parameter. Use it. (do_target_wait): Rename to ... (do_target_wait_1): ... this. Add inferior parameter, and pass it down. (threads_are_resumed_pending_p, do_target_wait): New. (prepare_for_detach): Adjust calls. (wait_for_inferior): New inferior parameter. Handle it. Use do_target_wait_1 instead of do_target_wait. (fetch_inferior_event): Adjust. Switch to representative inferior. Pass target down. (set_last_target_status): Add process_stratum_target parameter. Save target in global. (get_last_target_status): Add process_stratum_target parameter and handle it. (nullify_last_target_wait_ptid): Clear 'target_last_proc_target'. (context_switch): Check inferior_ptid == null_ptid before calling inferior_thread(). (get_inferior_stop_soon): Pass down target. (wait_one): Rename to ... (poll_one_curr_target): ... this. (struct wait_one_event): New. (wait_one): New. (stop_all_threads): Adjust. (handle_no_resumed, handle_inferior_event): Adjust to consider the event's target. (switch_back_to_stepped_thread): Also consider target. (print_stop_event): Update. (normal_stop): Update. Also consider the resume target. * infrun.h (wait_for_inferior): Remove declaration. (user_visible_resume_target): New declaration. (get_last_target_status, set_last_target_status): New process_stratum_target parameter. * inline-frame.c (clear_inline_frame_state(ptid_t)): Add process_stratum_target parameter, and use it. (clear_inline_frame_state (thread_info*)): New. * inline-frame.c (clear_inline_frame_state(ptid_t)): Add process_stratum_target parameter. (clear_inline_frame_state (thread_info*)): Declare. * linux-fork.c (delete_checkpoint_command): Pass target down to find_thread_ptid. (checkpoint_command): Adjust. * linux-nat.c (linux_nat_target::follow_fork): Switch to thread instead of just tweaking inferior_ptid. (linux_nat_switch_fork): Pass target down to thread_change_ptid. (exit_lwp): Pass target down to find_thread_ptid. (attach_proc_task_lwp_callback): Pass target down to add_thread/set_running/set_executing. (linux_nat_target::attach): Pass target down to thread_change_ptid. (get_detach_signal): Pass target down to find_thread_ptid. Consider last target status's target. (linux_resume_one_lwp_throw, resume_lwp) (linux_handle_syscall_trap, linux_handle_extended_wait, wait_lwp) (stop_wait_callback, save_stop_reason, linux_nat_filter_event) (linux_nat_wait_1, resume_stopped_resumed_lwps): Pass target down. (linux_nat_target::async_wait_fd): New. (linux_nat_stop_lwp, linux_nat_target::thread_address_space): Pass target down. * linux-nat.h (linux_nat_target::async_wait_fd): Declare. * linux-tdep.c (get_thread_arch_regcache): Pass target down. * linux-thread-db.c (struct thread_db_info::process_target): New field. (add_thread_db_info): Save target. (get_thread_db_info): New process_stratum_target parameter. Also match target. (delete_thread_db_info): New process_stratum_target parameter. Also match target. (thread_from_lwp): Adjust to pass down target. (thread_db_notice_clone): Pass down target. (check_thread_db_callback): Pass down target. (try_thread_db_load_1): Always push the thread_db target. (try_thread_db_load, record_thread): Pass target down. (thread_db_target::detach): Pass target down. Always unpush the thread_db target. (thread_db_target::wait, thread_db_target::mourn_inferior): Pass target down. Always unpush the thread_db target. (find_new_threads_callback, thread_db_find_new_threads_2) (thread_db_target::update_thread_list): Pass target down. (thread_db_target::pid_to_str): Pass current inferior down. (thread_db_target::get_thread_local_address): Pass target down. (thread_db_target::resume, maintenance_check_libthread_db): Pass target down. * nto-procfs.c (nto_procfs_target::update_thread_list): Adjust. * procfs.c (procfs_target::procfs_init_inferior): Declare. (proc_set_current_signal, do_attach, procfs_target::wait): Adjust. (procfs_init_inferior): Rename to ... (procfs_target::procfs_init_inferior): ... this and adjust. (procfs_target::create_inferior, procfs_notice_thread) (procfs_do_thread_registers): Adjust. * ppc-fbsd-tdep.c: Include "inferior.h". (ppcfbsd_get_thread_local_address): Pass down target. * proc-service.c (ps_xfer_memory): Switch current inferior and program space as well. (get_ps_regcache): Pass target down. * process-stratum-target.c (process_stratum_target::thread_address_space) (process_stratum_target::thread_architecture): Pass target down. * process-stratum-target.h (process_stratum_target::threads_executing): New field. (as_process_stratum_target): New. * ravenscar-thread.c (ravenscar_thread_target::update_inferior_ptid): Pass target down. (ravenscar_thread_target::wait, ravenscar_add_thread): Pass target down. * record-btrace.c (record_btrace_target::info_record): Adjust. (record_btrace_target::record_method) (record_btrace_target::record_is_replaying) (record_btrace_target::fetch_registers) (get_thread_current_frame_id, record_btrace_target::resume) (record_btrace_target::wait, record_btrace_target::stop): Pass target down. * record-full.c (record_full_wait_1): Switch to event thread. Pass target down. * regcache.c (regcache::regcache) (get_thread_arch_aspace_regcache, get_thread_arch_regcache): Add process_stratum_target parameter and handle it. (current_thread_target): New global. (get_thread_regcache): Add process_stratum_target parameter and handle it. Switch inferior before calling target method. (get_thread_regcache): Pass target down. (get_thread_regcache_for_ptid): Pass target down. (registers_changed_ptid): Add process_stratum_target parameter and handle it. (registers_changed_thread, registers_changed): Pass target down. (test_get_thread_arch_aspace_regcache): New. (current_regcache_test): Define a couple local test_target_ops instances and use them for testing. (readwrite_regcache): Pass process_stratum_target parameter. (cooked_read_test, cooked_write_test): Pass mock_target down. * regcache.h (get_thread_regcache, get_thread_arch_regcache) (get_thread_arch_aspace_regcache): Add process_stratum_target parameter. (regcache::target): New method. (regcache::regcache, regcache::get_thread_arch_aspace_regcache) (regcache::registers_changed_ptid): Add process_stratum_target parameter. (regcache::m_target): New field. (registers_changed_ptid): Add process_stratum_target parameter. * remote.c (remote_state::supports_vCont_probed): New field. (remote_target::async_wait_fd): New method. (remote_unpush_and_throw): Add remote_target parameter. (get_current_remote_target): Adjust. (remote_target::remote_add_inferior): Push target. (remote_target::remote_add_thread) (remote_target::remote_notice_new_inferior) (get_remote_thread_info): Pass target down. (remote_target::update_thread_list): Skip threads of inferiors bound to other targets. (remote_target::close): Don't discard inferiors. (remote_target::add_current_inferior_and_thread) (remote_target::process_initial_stop_replies) (remote_target::start_remote) (remote_target::remote_serial_quit_handler): Pass down target. (remote_target::remote_unpush_target): New remote_target parameter. Unpush the target from all inferiors. (remote_target::remote_unpush_and_throw): New remote_target parameter. Pass it down. (remote_target::open_1): Check whether the current inferior has execution instead of checking whether any inferior is live. Pass target down. (remote_target::remote_detach_1): Pass down target. Use remote_unpush_target. (extended_remote_target::attach): Pass down target. (remote_target::remote_vcont_probe): Set supports_vCont_probed. (remote_target::append_resumption): Pass down target. (remote_target::append_pending_thread_resumptions) (remote_target::remote_resume_with_hc, remote_target::resume) (remote_target::commit_resume): Pass down target. (remote_target::remote_stop_ns): Check supports_vCont_probed. (remote_target::interrupt_query) (remote_target::remove_new_fork_children) (remote_target::check_pending_events_prevent_wildcard_vcont) (remote_target::remote_parse_stop_reply) (remote_target::process_stop_reply): Pass down target. (first_remote_resumed_thread): New remote_target parameter. Pass it down. (remote_target::wait_as): Pass down target. (unpush_and_perror): New remote_target parameter. Pass it down. (remote_target::readchar, remote_target::remote_serial_write) (remote_target::getpkt_or_notif_sane_1) (remote_target::kill_new_fork_children, remote_target::kill): Pass down target. (remote_target::mourn_inferior): Pass down target. Use remote_unpush_target. (remote_target::core_of_thread) (remote_target::remote_btrace_maybe_reopen): Pass down target. (remote_target::pid_to_exec_file) (remote_target::thread_handle_to_thread_info): Pass down target. (remote_target::async_wait_fd): New. * riscv-fbsd-tdep.c: Include "inferior.h". (riscv_fbsd_get_thread_local_address): Pass down target. * sol2-tdep.c (sol2_core_pid_to_str): Pass down target. * sol-thread.c (sol_thread_target::wait, ps_lgetregs, ps_lsetregs) (ps_lgetfpregs, ps_lsetfpregs, sol_update_thread_list_callback): Adjust. * solib-spu.c (spu_skip_standalone_loader): Pass down target. * solib-svr4.c (enable_break): Pass down target. * spu-multiarch.c (parse_spufs_run): Pass down target. * spu-tdep.c (spu2ppu_sniffer): Pass down target. * target-delegates.c: Regenerate. * target.c (g_target_stack): Delete. (current_top_target): Return the current inferior's top target. (target_has_execution_1): Refer to the passed-in inferior's top target. (target_supports_terminal_ours): Check whether the initial inferior was already created. (decref_target): New. (target_stack::push): Incref/decref the target. (push_target, push_target, unpush_target): Adjust. (target_stack::unpush): Defref target. (target_is_pushed): Return bool. Adjust to refer to the current inferior's target stack. (dispose_inferior): Delete, and inline parts ... (target_preopen): ... here. Only dispose of the current inferior. (target_detach): Hold strong target reference while detaching. Pass target down. (target_thread_name): Add assertion. (target_resume): Pass down target. (target_ops::beneath, find_target_at): Adjust to refer to the current inferior's target stack. (get_dummy_target): New. (target_pass_ctrlc): Pass the Ctrl-C to the first inferior that has a thread running. (initialize_targets): Rename to ... (_initialize_target): ... this. * target.h: Include "gdbsupport/refcounted-object.h". (struct target_ops): Inherit refcounted_object. (target_ops::shortname, target_ops::longname): Make const. (target_ops::async_wait_fd): New method. (decref_target): Declare. (struct target_ops_ref_policy): New. (target_ops_ref): New typedef. (get_dummy_target): Declare function. (target_is_pushed): Return bool. * thread-iter.c (all_matching_threads_iterator::m_inf_matches) (all_matching_threads_iterator::all_matching_threads_iterator): Handle filter target. * thread-iter.h (struct all_matching_threads_iterator, struct all_matching_threads_range, class all_non_exited_threads_range): Filter by target too. Remove explicit. * thread.c (threads_executing): Delete. (inferior_thread): Pass down current inferior. (clear_thread_inferior_resources): Pass down thread pointer instead of ptid_t. (add_thread_silent, add_thread_with_info, add_thread): Add process_stratum_target parameter. Use it for thread and inferior searches. (is_current_thread): New. (thread_info::deletable): Use it. (find_thread_ptid, thread_count, in_thread_list) (thread_change_ptid, set_resumed, set_running): New process_stratum_target parameter. Pass it down. (set_executing): New process_stratum_target parameter. Pass it down. Adjust reference to 'threads_executing'. (threads_are_executing): New process_stratum_target parameter. Adjust reference to 'threads_executing'. (set_stop_requested, finish_thread_state): New process_stratum_target parameter. Pass it down. (switch_to_thread): Also match inferior. (switch_to_thread): New process_stratum_target parameter. Pass it down. (update_threads_executing): Reimplement. * top.c (quit_force): Pop targets from all inferior. (gdb_init): Don't call initialize_targets. * windows-nat.c (windows_nat_target) <get_windows_debug_event>: Declare. (windows_add_thread, windows_delete_thread): Adjust. (get_windows_debug_event): Rename to ... (windows_nat_target::get_windows_debug_event): ... this. Adjust. * tracefile-tfile.c (tfile_target_open): Pass down target. * gdbsupport/common-gdbthread.h (struct process_stratum_target): Forward declare. (switch_to_thread): Add process_stratum_target parameter. * mi/mi-interp.c (mi_on_resume_1): Add process_stratum_target parameter. Use it. (mi_on_resume): Pass target down. * nat/fork-inferior.c (startup_inferior): Add process_stratum_target parameter. Pass it down. * nat/fork-inferior.h (startup_inferior): Add process_stratum_target parameter. * python/py-threadevent.c (py_get_event_thread): Pass target down. gdb/gdbserver/ChangeLog: 2020-01-10 Pedro Alves <[email protected]> * fork-child.c (post_fork_inferior): Pass target down to startup_inferior. * inferiors.c (switch_to_thread): Add process_stratum_target parameter. * lynx-low.c (lynx_target_ops): Now a process_stratum_target. * nto-low.c (nto_target_ops): Now a process_stratum_target. * linux-low.c (linux_target_ops): Now a process_stratum_target. * remote-utils.c (prepare_resume_reply): Pass the target to switch_to_thread. * target.c (the_target): Now a process_stratum_target. (done_accessing_memory): Pass the target to switch_to_thread. (set_target_ops): Ajust to use process_stratum_target. * target.h (struct target_ops): Rename to ... (struct process_stratum_target): ... this. (the_target, set_target_ops): Adjust. (prepare_to_access_memory): Adjust comment. * win32-low.c (child_xfer_memory): Adjust to use process_stratum_target. (win32_target_ops): Now a process_stratum_target.
1 parent 75c6c84 commit 5b6d1e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2263
-866
lines changed

Diff for: gdb/ChangeLog

+419
Large diffs are not rendered by default.

Diff for: gdb/aarch64-linux-nat.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,7 @@ aarch64_linux_nat_target::thread_architecture (ptid_t ptid)
959959

960960
/* Find the current gdbarch the same way as process_stratum_target. Only
961961
return it if the current vector length matches the one in the tdep. */
962-
inferior *inf = find_inferior_ptid (ptid);
962+
inferior *inf = find_inferior_ptid (this, ptid);
963963
gdb_assert (inf != NULL);
964964
if (vq == gdbarch_tdep (inf->gdbarch)->vq)
965965
return inf->gdbarch;

Diff for: gdb/ada-tasks.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,7 @@ print_ada_task_info (struct ui_out *uiout,
11281128
if (uiout->is_mi_like_p ())
11291129
{
11301130
thread_info *thread = (ada_task_is_alive (task_info)
1131-
? find_thread_ptid (task_info->ptid)
1131+
? find_thread_ptid (inf, task_info->ptid)
11321132
: nullptr);
11331133

11341134
if (thread != NULL)
@@ -1343,7 +1343,7 @@ task_command_1 (const char *taskno_str, int from_tty, struct inferior *inf)
13431343
computed if target_get_ada_task_ptid has not been implemented for
13441344
our target (yet). Rather than cause an assertion error in that case,
13451345
it's nicer for the user to just refuse to perform the task switch. */
1346-
thread_info *tp = find_thread_ptid (task_info->ptid);
1346+
thread_info *tp = find_thread_ptid (inf, task_info->ptid);
13471347
if (tp == NULL)
13481348
error (_("Unable to compute thread ID for task %s.\n"
13491349
"Cannot switch to this task."),

Diff for: gdb/aix-thread.c

+17-7
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,11 @@ sync_threadlists (void)
805805
priv->pdtid = pbuf[pi].pdtid;
806806
priv->tid = pbuf[pi].tid;
807807

808-
thread = add_thread_with_info (ptid_t (infpid, 0, pbuf[pi].pthid), priv);
808+
process_stratum_target *proc_target
809+
= current_inferior ()->process_target ();
810+
thread = add_thread_with_info (proc_target,
811+
ptid_t (infpid, 0, pbuf[pi].pthid),
812+
priv);
809813

810814
pi++;
811815
}
@@ -837,7 +841,9 @@ sync_threadlists (void)
837841
}
838842
else
839843
{
840-
thread = add_thread (pptid);
844+
process_stratum_target *proc_target
845+
= current_inferior ()->process_target ();
846+
thread = add_thread (proc_target, pptid);
841847

842848
aix_thread_info *priv = new aix_thread_info;
843849
thread->priv.reset (priv);
@@ -1043,7 +1049,7 @@ aix_thread_target::resume (ptid_t ptid, int step, enum gdb_signal sig)
10431049
}
10441050
else
10451051
{
1046-
thread = find_thread_ptid (ptid);
1052+
thread = find_thread_ptid (current_inferior (), ptid);
10471053
if (!thread)
10481054
error (_("aix-thread resume: unknown pthread %ld"),
10491055
ptid.lwp ());
@@ -1089,7 +1095,9 @@ aix_thread_target::wait (ptid_t ptid, struct target_waitstatus *status,
10891095
if (!pd_active && status->kind == TARGET_WAITKIND_STOPPED
10901096
&& status->value.sig == GDB_SIGNAL_TRAP)
10911097
{
1092-
struct regcache *regcache = get_thread_regcache (ptid);
1098+
process_stratum_target *proc_target
1099+
= current_inferior ()->process_target ();
1100+
struct regcache *regcache = get_thread_regcache (proc_target, ptid);
10931101
struct gdbarch *gdbarch = regcache->arch ();
10941102

10951103
if (regcache_read_pc (regcache)
@@ -1354,7 +1362,7 @@ aix_thread_target::fetch_registers (struct regcache *regcache, int regno)
13541362
beneath ()->fetch_registers (regcache, regno);
13551363
else
13561364
{
1357-
thread = find_thread_ptid (regcache->ptid ());
1365+
thread = find_thread_ptid (current_inferior (), regcache->ptid ());
13581366
aix_thread_info *priv = get_aix_thread_info (thread);
13591367
tid = priv->tid;
13601368

@@ -1692,7 +1700,7 @@ aix_thread_target::store_registers (struct regcache *regcache, int regno)
16921700
beneath ()->store_registers (regcache, regno);
16931701
else
16941702
{
1695-
thread = find_thread_ptid (regcache->ptid ());
1703+
thread = find_thread_ptid (current_inferior (), regcache->ptid ());
16961704
aix_thread_info *priv = get_aix_thread_info (thread);
16971705
tid = priv->tid;
16981706

@@ -1740,7 +1748,9 @@ aix_thread_target::thread_alive (ptid_t ptid)
17401748

17411749
/* We update the thread list every time the child stops, so all
17421750
valid threads should be in the thread list. */
1743-
return in_thread_list (ptid);
1751+
process_stratum_target *proc_target
1752+
= current_inferior ()->process_target ();
1753+
return in_thread_list (proc_target, ptid);
17441754
}
17451755

17461756
/* Return a printable representation of composite PID for use in

Diff for: gdb/amd64-fbsd-tdep.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "amd64-tdep.h"
3131
#include "fbsd-tdep.h"
3232
#include "solib-svr4.h"
33+
#include "inferior.h"
3334

3435
/* Support for signal handlers. */
3536

@@ -212,7 +213,8 @@ amd64fbsd_get_thread_local_address (struct gdbarch *gdbarch, ptid_t ptid,
212213
{
213214
struct regcache *regcache;
214215

215-
regcache = get_thread_arch_regcache (ptid, gdbarch);
216+
regcache = get_thread_arch_regcache (current_inferior ()->process_target (),
217+
ptid, gdbarch);
216218

217219
target_fetch_registers (regcache, AMD64_FSBASE_REGNUM);
218220

Diff for: gdb/amd64-linux-nat.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ ps_err_e
383383
ps_get_thread_area (struct ps_prochandle *ph,
384384
lwpid_t lwpid, int idx, void **base)
385385
{
386-
if (gdbarch_bfd_arch_info (target_gdbarch ())->bits_per_word == 32)
386+
if (gdbarch_bfd_arch_info (ph->thread->inf->gdbarch)->bits_per_word == 32)
387387
{
388388
unsigned int base_addr;
389389
ps_err_e result;

Diff for: gdb/break-catch-sig.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ signal_catchpoint_print_it (bpstat bs)
185185
const char *signal_name;
186186
struct ui_out *uiout = current_uiout;
187187

188-
get_last_target_status (nullptr, &last);
188+
get_last_target_status (nullptr, nullptr, &last);
189189

190190
signal_name = signal_to_name_or_int (last.value.sig);
191191

Diff for: gdb/break-catch-syscall.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ print_it_catch_syscall (bpstat bs)
186186
struct syscall s;
187187
struct gdbarch *gdbarch = bs->bp_location_at->gdbarch;
188188

189-
get_last_target_status (nullptr, &last);
189+
get_last_target_status (nullptr, nullptr, &last);
190190

191191
get_syscall_by_number (gdbarch, last.value.syscall_number, &s);
192192

Diff for: gdb/breakpoint.c

+19-6
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ breakpoints_should_be_inserted_now (void)
389389
no threads under GDB's control yet. */
390390
return 1;
391391
}
392-
else if (target_has_execution)
392+
else
393393
{
394394
if (always_inserted_mode)
395395
{
@@ -398,8 +398,10 @@ breakpoints_should_be_inserted_now (void)
398398
return 1;
399399
}
400400

401-
if (threads_are_executing ())
402-
return 1;
401+
for (inferior *inf : all_inferiors ())
402+
if (inf->has_execution ()
403+
&& threads_are_executing (inf->process_target ()))
404+
return 1;
403405

404406
/* Don't remove breakpoints yet if, even though all threads are
405407
stopped, we still have events to process. */
@@ -2887,7 +2889,7 @@ update_inserted_breakpoint_locations (void)
28872889
if we aren't attached to any process yet, we should still
28882890
insert breakpoints. */
28892891
if (!gdbarch_has_global_breakpoints (target_gdbarch ())
2890-
&& inferior_ptid == null_ptid)
2892+
&& (inferior_ptid == null_ptid || !target_has_execution))
28912893
continue;
28922894

28932895
val = insert_bp_location (bl, &tmp_error_stream, &disabled_breaks,
@@ -2943,7 +2945,7 @@ insert_breakpoint_locations (void)
29432945
if we aren't attached to any process yet, we should still
29442946
insert breakpoints. */
29452947
if (!gdbarch_has_global_breakpoints (target_gdbarch ())
2946-
&& inferior_ptid == null_ptid)
2948+
&& (inferior_ptid == null_ptid || !target_has_execution))
29472949
continue;
29482950

29492951
val = insert_bp_location (bl, &tmp_error_stream, &disabled_breaks,
@@ -11903,7 +11905,18 @@ update_global_location_list (enum ugll_insert_mode insert_mode)
1190311905
around. We simply always ignore hardware watchpoint
1190411906
traps we can no longer explain. */
1190511907

11906-
old_loc->events_till_retirement = 3 * (thread_count () + 1);
11908+
process_stratum_target *proc_target = nullptr;
11909+
for (inferior *inf : all_inferiors ())
11910+
if (inf->pspace == old_loc->pspace)
11911+
{
11912+
proc_target = inf->process_target ();
11913+
break;
11914+
}
11915+
if (proc_target != nullptr)
11916+
old_loc->events_till_retirement
11917+
= 3 * (thread_count (proc_target) + 1);
11918+
else
11919+
old_loc->events_till_retirement = 1;
1190711920
old_loc->owner = NULL;
1190811921

1190911922
moribund_locations.push_back (old_loc);

Diff for: gdb/bsd-kvm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ bsd_kvm_target_open (const char *arg, int from_tty)
136136
core_kd = temp_kd;
137137
push_target (&bsd_kvm_ops);
138138

139-
add_thread_silent (bsd_kvm_ptid);
139+
add_thread_silent (&bsd_kvm_ops, bsd_kvm_ptid);
140140
inferior_ptid = bsd_kvm_ptid;
141141

142142
target_fetch_registers (get_current_regcache (), -1);

Diff for: gdb/bsd-uthread.c

+12-8
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,11 @@ bsd_uthread_target::wait (ptid_t ptid, struct target_waitstatus *status,
381381
{
382382
enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
383383
CORE_ADDR addr;
384+
process_stratum_target *beneath
385+
= as_process_stratum_target (this->beneath ());
384386

385387
/* Pass the request to the layer beneath. */
386-
ptid = beneath ()->wait (ptid, status, options);
388+
ptid = beneath->wait (ptid, status, options);
387389

388390
/* If the process is no longer alive, there's no point in figuring
389391
out the thread ID. It will fail anyway. */
@@ -414,13 +416,13 @@ bsd_uthread_target::wait (ptid_t ptid, struct target_waitstatus *status,
414416
ptid with tid set, then ptid is still the initial thread of
415417
the process. Notify GDB core about it. */
416418
if (inferior_ptid.tid () == 0
417-
&& ptid.tid () != 0 && !in_thread_list (ptid))
418-
thread_change_ptid (inferior_ptid, ptid);
419+
&& ptid.tid () != 0 && !in_thread_list (beneath, ptid))
420+
thread_change_ptid (beneath, inferior_ptid, ptid);
419421

420422
/* Don't let the core see a ptid without a corresponding thread. */
421-
thread_info *thread = find_thread_ptid (ptid);
423+
thread_info *thread = find_thread_ptid (beneath, ptid);
422424
if (thread == NULL || thread->state == THREAD_EXITED)
423-
add_thread (ptid);
425+
add_thread (beneath, ptid);
424426

425427
return ptid;
426428
}
@@ -467,16 +469,18 @@ bsd_uthread_target::update_thread_list ()
467469
{
468470
ptid_t ptid = ptid_t (pid, 0, addr);
469471

470-
thread_info *thread = find_thread_ptid (ptid);
472+
process_stratum_target *proc_target
473+
= as_process_stratum_target (this->beneath ());
474+
thread_info *thread = find_thread_ptid (proc_target, ptid);
471475
if (thread == nullptr || thread->state == THREAD_EXITED)
472476
{
473477
/* If INFERIOR_PTID doesn't have a tid member yet, then ptid
474478
is still the initial thread of the process. Notify GDB
475479
core about it. */
476480
if (inferior_ptid.tid () == 0)
477-
thread_change_ptid (inferior_ptid, ptid);
481+
thread_change_ptid (proc_target, inferior_ptid, ptid);
478482
else
479-
add_thread (ptid);
483+
add_thread (proc_target, ptid);
480484
}
481485

482486
addr = bsd_uthread_read_memory_address (addr + offset);

Diff for: gdb/btrace.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3228,7 +3228,7 @@ maint_btrace_packet_history_cmd (const char *arg, int from_tty)
32283228
struct btrace_thread_info *btinfo;
32293229
unsigned int size, begin, end, from, to;
32303230

3231-
thread_info *tp = find_thread_ptid (inferior_ptid);
3231+
thread_info *tp = find_thread_ptid (current_inferior (), inferior_ptid);
32323232
if (tp == NULL)
32333233
error (_("No thread."));
32343234

Diff for: gdb/corelow.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg)
314314

315315
ptid = ptid_t (pid, lwpid, 0);
316316

317-
add_thread (ptid);
317+
add_thread (inf->process_target (), ptid);
318318

319319
/* Warning, Will Robinson, looking at BFD private data! */
320320

@@ -472,7 +472,7 @@ core_target_open (const char *arg, int from_tty)
472472
{
473473
inferior_appeared (current_inferior (), CORELOW_PID);
474474
inferior_ptid = ptid_t (CORELOW_PID);
475-
add_thread_silent (inferior_ptid);
475+
add_thread_silent (target, inferior_ptid);
476476
}
477477
else
478478
switch_to_thread (thread);
@@ -540,7 +540,7 @@ core_target_open (const char *arg, int from_tty)
540540
/* Current thread should be NUM 1 but the user does not know that.
541541
If a program is single threaded gdb in general does not mention
542542
anything about threads. That is why the test is >= 2. */
543-
if (thread_count () >= 2)
543+
if (thread_count (target) >= 2)
544544
{
545545
try
546546
{
@@ -944,7 +944,7 @@ core_target::pid_to_str (ptid_t ptid)
944944

945945
/* Otherwise, this isn't a "threaded" core -- use the PID field, but
946946
only if it isn't a fake PID. */
947-
inf = find_inferior_ptid (ptid);
947+
inf = find_inferior_ptid (this, ptid);
948948
if (inf != NULL && !inf->fake_pid_p)
949949
return normal_pid_to_str (ptid);
950950

Diff for: gdb/event-top.c

+9-5
Original file line numberDiff line numberDiff line change
@@ -1137,12 +1137,16 @@ async_disconnect (gdb_client_data arg)
11371137
exception_print (gdb_stderr, exception);
11381138
}
11391139

1140-
try
1141-
{
1142-
pop_all_targets ();
1143-
}
1144-
catch (const gdb_exception &exception)
1140+
for (inferior *inf : all_inferiors ())
11451141
{
1142+
switch_to_inferior_no_thread (inf);
1143+
try
1144+
{
1145+
pop_all_targets ();
1146+
}
1147+
catch (const gdb_exception &exception)
1148+
{
1149+
}
11461150
}
11471151

11481152
signal (SIGHUP, SIG_DFL); /*FIXME: ??????????? */

0 commit comments

Comments
 (0)