mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +08:00
a068643d69
Currently the target pid_to_str method returns a const char *, so many implementations have a static buffer that they update. This patch changes these methods to return a std::string instead. I think this is cleaner and avoids possible gotchas when calling pid_to_str on different ptids in a single statement. (Though no such calls exist currently.) This also updates various helper functions, and the gdbarch pid_to_str methods. I also made a best effort to fix all the callers, but I can't build some of the *-nat.c files. Tested by the buildbot. gdb/ChangeLog 2019-03-13 Tom Tromey <tromey@adacore.com> * i386-gnu-nat.c (i386_gnu_nat_target::fetch_registers) (i386_gnu_nat_target::store_registers): Update. * target-debug.h (target_debug_print_std_string): New macro. * x86-linux-nat.c (x86_linux_nat_target::enable_btrace): Update. * windows-tdep.c (display_one_tib): Update. * tui/tui-stack.c (tui_make_status_line): Update. * top.c (print_inferior_quit_action): Update. * thread.c (thr_try_catch_cmd): Update. (add_thread_with_info): Update. (thread_target_id_str): Update. (thr_try_catch_cmd): Update. (thread_command): Update. (thread_find_command): Update. * record-btrace.c (record_btrace_target::info_record) (record_btrace_resume_thread, record_btrace_target::resume) (record_btrace_cancel_resume, record_btrace_step_thread) (record_btrace_target::wait, record_btrace_target::wait) (record_btrace_target::wait, record_btrace_target::stop): Update. * progspace.c (print_program_space): Update. * process-stratum-target.c (process_stratum_target::thread_address_space): Update. * linux-fork.c (linux_fork_mourn_inferior) (detach_checkpoint_command, info_checkpoints_command) (linux_fork_context): Update. (linux_fork_detach): Update. (class scoped_switch_fork_info): Update. (delete_checkpoint_command): Update. * infrun.c (follow_fork_inferior): Update. (follow_fork_inferior): Update. (proceed_after_vfork_done): Update. (handle_vfork_child_exec_or_exit): Update. (follow_exec): Update. (displaced_step_prepare_throw): Update. (displaced_step_restore): Update. (start_step_over): Update. (resume_1): Update. (clear_proceed_status_thread): Update. (proceed): Update. (print_target_wait_results): Update. (do_target_wait): Update. (context_switch): Update. (stop_all_threads): Update. (restart_threads): Update. (finish_step_over): Update. (handle_signal_stop): Update. (switch_back_to_stepped_thread): Update. (keep_going_pass_signal): Update. (print_exited_reason): Update. (normal_stop): Update. * inferior.c (inferior_pid_to_str): Change return type. (print_selected_inferior): Update. (add_inferior): Update. (detach_inferior): Update. * dummy-frame.c (fprint_dummy_frames): Update. * dcache.c (dcache_info_1): Update. * btrace.c (btrace_enable, btrace_disable, btrace_teardown) (btrace_fetch, btrace_clear): Update. * linux-tdep.c (linux_core_pid_to_str): Change return type. * i386-cygwin-tdep.c (i386_windows_core_pid_to_str): Change return type. * fbsd-tdep.c (fbsd_core_pid_to_str): Change return type. * sol2-tdep.h (sol2_core_pid_to_str): Change return type. * sol2-tdep.c (sol2_core_pid_to_str): Change return type. * gdbarch.c, gdbarch.h: Rebuild. * gdbarch.sh (core_pid_to_str): Change return type. * windows-nat.c (struct windows_nat_target) <pid_to_str>: Change return type. (windows_nat_target::pid_to_str): Change return type. (windows_delete_thread): Update. (windows_nat_target::attach): Update. (windows_nat_target::files_info): Update. * target-delegates.c: Rebuild. * sol-thread.c (class sol_thread_target) <pid_to_str>: Change return type. (sol_thread_target::pid_to_str): Change return type. * remote.c (class remote_target) <pid_to_str>: Change return type. (remote_target::pid_to_str): Change return type. (extended_remote_target::attach, remote_target::remote_stop_ns) (remote_target::remote_notif_remove_queued_reply) (remote_target::push_stop_reply, remote_target::disable_btrace): Update. (extended_remote_target::attach): Update. * remote-sim.c (struct gdbsim_target) <pid_to_str>: Change return type. (gdbsim_target::pid_to_str): Change return type. * ravenscar-thread.c (struct ravenscar_thread_target) <pid_to_str>: Change return type. (ravenscar_thread_target::pid_to_str): Change return type. * procfs.c (class procfs_target) <pid_to_str>: Change return type. (procfs_target::pid_to_str): Change return type. (procfs_target::attach): Update. (procfs_target::detach): Update. (procfs_target::fetch_registers): Update. (procfs_target::store_registers): Update. (procfs_target::wait): Update. (procfs_target::files_info): Update. * obsd-nat.c (obsd_nat_target::pid_to_str): Change return type. * nto-procfs.c (struct nto_procfs_target) <pid_to_str>: Change return type. (nto_procfs_target::pid_to_str): Change return type. (nto_procfs_target::files_info, nto_procfs_target::attach): Update. * linux-thread-db.c (class thread_db_target) <pid_to_str>: Change return type. * linux-nat.c (linux_nat_target::pid_to_str): Change return type. (exit_lwp): Update. (attach_proc_task_lwp_callback, get_detach_signal) (detach_one_lwp, resume_lwp, linux_nat_target::resume) (linux_nat_target::resume, wait_lwp, stop_callback) (maybe_clear_ignore_sigint, stop_wait_callback, status_callback) (save_stop_reason, select_event_lwp, linux_nat_filter_event) (linux_nat_wait_1, resume_stopped_resumed_lwps) (linux_nat_target::wait, linux_nat_stop_lwp): Update. * inf-ptrace.c (inf_ptrace_target::pid_to_str): Change return type. (inf_ptrace_target::attach): Update. (inf_ptrace_target::files_info): Update. * go32-nat.c (struct go32_nat_target) <pid_to_str>: Change return type. (go32_nat_target::pid_to_str): Change return type. * gnu-nat.c (gnu_nat_target::pid_to_str): Change return type. (gnu_nat_target::wait): Update. (gnu_nat_target::wait): Update. (gnu_nat_target::resume): Update. * fbsd-nat.c (fbsd_nat_target::pid_to_str): Change return type. (fbsd_nat_target::wait): Update. * darwin-nat.c (darwin_nat_target::pid_to_str): Change return type. (darwin_nat_target::attach): Update. * corelow.c (class core_target) <pid_to_str>: Change return type. (core_target::pid_to_str): Change return type. * target.c (normal_pid_to_str): Change return type. (default_pid_to_str): Likewise. (target_pid_to_str): Change return type. (target_translate_tls_address): Update. (target_announce_detach): Update. * bsd-uthread.c (struct bsd_uthread_target) <pid_to_str>: Change return type. (bsd_uthread_target::pid_to_str): Change return type. * bsd-kvm.c (class bsd_kvm_target) <pid_to_str>: Change return type. (bsd_kvm_target::pid_to_str): Change return type. * aix-thread.c (class aix_thread_target) <pid_to_str>: Change return type. (aix_thread_target::pid_to_str): Change return type. * target.h (struct target_ops) <pid_to_str>: Change return type. (target_pid_to_str, normal_pid_to_str): Likewise. * obsd-nat.h (class obsd_nat_target) <pid_to_str>: Change return type. * linux-nat.h (class linux_nat_target) <pid_to_str>: Change return type. * inf-ptrace.h (struct inf_ptrace_target) <pid_to_str>: Change return type. * gnu-nat.h (struct gnu_nat_target) <pid_to_str>: Change return type. * fbsd-nat.h (class fbsd_nat_target) <pid_to_str>: Change return type. * darwin-nat.h (class darwin_nat_target) <pid_to_str>: Change return type.
164 lines
3.9 KiB
C
164 lines
3.9 KiB
C
/* Native-dependent code for OpenBSD.
|
|
|
|
Copyright (C) 2012-2019 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 "gdbthread.h"
|
|
#include "inferior.h"
|
|
#include "target.h"
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/ptrace.h>
|
|
#include "common/gdb_wait.h"
|
|
|
|
#include "inf-child.h"
|
|
#include "obsd-nat.h"
|
|
|
|
/* OpenBSD 5.2 and later include rthreads which uses a thread model
|
|
that maps userland threads directly onto kernel threads in a 1:1
|
|
fashion. */
|
|
|
|
#ifdef PT_GET_THREAD_FIRST
|
|
|
|
std::sring
|
|
obsd_nat_target::pid_to_str (ptid_t ptid)
|
|
{
|
|
if (ptid.lwp () != 0)
|
|
return string_printf ("thread %ld", ptid.lwp ());
|
|
|
|
return normal_pid_to_str (ptid);
|
|
}
|
|
|
|
void
|
|
obsd_nat_target::update_thread_list ()
|
|
{
|
|
pid_t pid = inferior_ptid.pid ();
|
|
struct ptrace_thread_state pts;
|
|
|
|
prune_threads ();
|
|
|
|
if (ptrace (PT_GET_THREAD_FIRST, pid, (caddr_t)&pts, sizeof pts) == -1)
|
|
perror_with_name (("ptrace"));
|
|
|
|
while (pts.pts_tid != -1)
|
|
{
|
|
ptid_t ptid = ptid_t (pid, pts.pts_tid, 0);
|
|
|
|
if (!in_thread_list (ptid))
|
|
{
|
|
if (inferior_ptid.lwp () == 0)
|
|
thread_change_ptid (inferior_ptid, ptid);
|
|
else
|
|
add_thread (ptid);
|
|
}
|
|
|
|
if (ptrace (PT_GET_THREAD_NEXT, pid, (caddr_t)&pts, sizeof pts) == -1)
|
|
perror_with_name (("ptrace"));
|
|
}
|
|
}
|
|
|
|
ptid_t
|
|
obsd_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
|
|
int options)
|
|
{
|
|
pid_t pid;
|
|
int status, save_errno;
|
|
|
|
do
|
|
{
|
|
set_sigint_trap ();
|
|
|
|
do
|
|
{
|
|
pid = waitpid (ptid.pid (), &status, 0);
|
|
save_errno = errno;
|
|
}
|
|
while (pid == -1 && errno == EINTR);
|
|
|
|
clear_sigint_trap ();
|
|
|
|
if (pid == -1)
|
|
{
|
|
fprintf_unfiltered (gdb_stderr,
|
|
_("Child process unexpectedly missing: %s.\n"),
|
|
safe_strerror (save_errno));
|
|
|
|
/* Claim it exited with unknown signal. */
|
|
ourstatus->kind = TARGET_WAITKIND_SIGNALLED;
|
|
ourstatus->value.sig = GDB_SIGNAL_UNKNOWN;
|
|
return inferior_ptid;
|
|
}
|
|
|
|
/* Ignore terminated detached child processes. */
|
|
if (!WIFSTOPPED (status) && pid != inferior_ptid.pid ())
|
|
pid = -1;
|
|
}
|
|
while (pid == -1);
|
|
|
|
ptid = ptid_t (pid);
|
|
|
|
if (WIFSTOPPED (status))
|
|
{
|
|
ptrace_state_t pe;
|
|
pid_t fpid;
|
|
|
|
if (ptrace (PT_GET_PROCESS_STATE, pid, (caddr_t)&pe, sizeof pe) == -1)
|
|
perror_with_name (("ptrace"));
|
|
|
|
switch (pe.pe_report_event)
|
|
{
|
|
case PTRACE_FORK:
|
|
ourstatus->kind = TARGET_WAITKIND_FORKED;
|
|
ourstatus->value.related_pid = ptid_t (pe.pe_other_pid);
|
|
|
|
/* Make sure the other end of the fork is stopped too. */
|
|
fpid = waitpid (pe.pe_other_pid, &status, 0);
|
|
if (fpid == -1)
|
|
perror_with_name (("waitpid"));
|
|
|
|
if (ptrace (PT_GET_PROCESS_STATE, fpid,
|
|
(caddr_t)&pe, sizeof pe) == -1)
|
|
perror_with_name (("ptrace"));
|
|
|
|
gdb_assert (pe.pe_report_event == PTRACE_FORK);
|
|
gdb_assert (pe.pe_other_pid == pid);
|
|
if (fpid == inferior_ptid.pid ())
|
|
{
|
|
ourstatus->value.related_pid = ptid_t (pe.pe_other_pid);
|
|
return ptid_t (fpid);
|
|
}
|
|
|
|
return ptid_t (pid);
|
|
}
|
|
|
|
ptid = ptid_t (pid, pe.pe_tid, 0);
|
|
if (!in_thread_list (ptid))
|
|
{
|
|
if (inferior_ptid.lwp () == 0)
|
|
thread_change_ptid (inferior_ptid, ptid);
|
|
else
|
|
add_thread (ptid);
|
|
}
|
|
}
|
|
|
|
store_waitstatus (ourstatus, status);
|
|
return ptid;
|
|
}
|
|
|
|
#endif /* PT_GET_THREAD_FIRST */
|