mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-23 10:03:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

gdbserver: remove pid_of(thread)

Browse Source 
This function doesn't seem so useful, use `thread_info:🆔:pid`
directly instead.

Change-Id: I7450c4223e5b0bf66788eeb5b070ab6f5287f798
Reviewed-By: Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
This commit is contained in:
Simon Marchi 2024-11-06 15:02:11 -05:00
parent 5929ef8975
commit 65b7d4502b
6 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdbserver/gdbthread.h
View File

@ -136,14 +136,6 @@ thread_info *find_thread_in_random
thread_info *find_thread_in_random thread_info *find_thread_in_random
(ptid_t ptid, gdb::function_view<bool (thread_info *)> func); (ptid_t ptid, gdb::function_view<bool (thread_info *)> func);
/* Get the pid of THREAD. */
static inline int
pid_of (const thread_info *thread)
{
return thread->id.pid ();
}
/* Switch the current thread. */ /* Switch the current thread. */
void switch_to_thread (thread_info *thread); void switch_to_thread (thread_info *thread);

6
gdbserver/linux-aarch64-low.cc
View File

@ -436,7 +436,7 @@ aarch64_target::low_insert_point (raw_bkpt_type type, CORE_ADDR addr,
int ret; int ret;
enum target_hw_bp_type targ_type; enum target_hw_bp_type targ_type;
struct aarch64_debug_reg_state *state struct aarch64_debug_reg_state *state
= aarch64_get_debug_reg_state (pid_of (current_thread)); = aarch64_get_debug_reg_state (current_thread->id.pid ());
if (show_debug_regs) if (show_debug_regs)
fprintf (stderr, "insert_point on entry (addr=0x%08lx, len=%d)\n", fprintf (stderr, "insert_point on entry (addr=0x%08lx, len=%d)\n",
@ -487,7 +487,7 @@ aarch64_target::low_remove_point (raw_bkpt_type type, CORE_ADDR addr,
int ret; int ret;
enum target_hw_bp_type targ_type; enum target_hw_bp_type targ_type;
struct aarch64_debug_reg_state *state struct aarch64_debug_reg_state *state
= aarch64_get_debug_reg_state (pid_of (current_thread)); = aarch64_get_debug_reg_state (current_thread->id.pid ());
if (show_debug_regs) if (show_debug_regs)
fprintf (stderr, "remove_point on entry (addr=0x%08lx, len=%d)\n", fprintf (stderr, "remove_point on entry (addr=0x%08lx, len=%d)\n",
@ -573,7 +573,7 @@ aarch64_target::low_stopped_data_address ()
= aarch64_remove_non_address_bits ((CORE_ADDR) siginfo.si_addr); = aarch64_remove_non_address_bits ((CORE_ADDR) siginfo.si_addr);
/* Check if the address matches any watched address. */ /* Check if the address matches any watched address. */
state = aarch64_get_debug_reg_state (pid_of (current_thread)); state = aarch64_get_debug_reg_state (current_thread->id.pid ());
CORE_ADDR result; CORE_ADDR result;
if (aarch64_stopped_data_address (state, addr_trap, &result)) if (aarch64_stopped_data_address (state, addr_trap, &result))
return result; return result;

2
gdbserver/linux-arm-low.cc
View File

@ -854,7 +854,7 @@ arm_target::low_prepare_to_resume (lwp_info *lwp)
{ {
struct thread_info *thread = get_lwp_thread (lwp); struct thread_info *thread = get_lwp_thread (lwp);
int pid = thread->id.lwp (); int pid = thread->id.lwp ();
struct process_info *proc = find_process_pid (pid_of (thread)); process_info *proc = find_process_pid (thread->id.pid ());
struct arch_process_info *proc_info = proc->priv->arch_private; struct arch_process_info *proc_info = proc->priv->arch_private;
struct arch_lwp_info *lwp_info = lwp->arch_private; struct arch_lwp_info *lwp_info = lwp->arch_private;
int i; int i;

11
gdbserver/linux-low.cc
View File

@ -2346,10 +2346,9 @@ linux_process_target::filter_event (int lwpid, int wstat)
if (WIFSTOPPED (wstat)) if (WIFSTOPPED (wstat))
{ {
struct process_info *proc;
/* Architecture-specific setup after inferior is running. */ /* Architecture-specific setup after inferior is running. */
proc = find_process_pid (pid_of (thread)); process_info *proc = find_process_pid (thread->id.pid ());
if (proc->tdesc == NULL) if (proc->tdesc == NULL)
{ {
if (proc->attached) if (proc->attached)
@ -2373,7 +2372,7 @@ linux_process_target::filter_event (int lwpid, int wstat)
if (WIFSTOPPED (wstat) && child->must_set_ptrace_flags) if (WIFSTOPPED (wstat) && child->must_set_ptrace_flags)
{ {
struct process_info *proc = find_process_pid (pid_of (thread)); process_info *proc = find_process_pid (thread->id.pid ());
int options = linux_low_ptrace_options (proc->attached); int options = linux_low_ptrace_options (proc->attached);
linux_enable_event_reporting (lwpid, options); linux_enable_event_reporting (lwpid, options);
@ -4279,7 +4278,7 @@ linux_set_resume_request (thread_info *thread, thread_resume *resume, size_t n)
|| ptid == thread->id || ptid == thread->id
/* Handle both 'pPID' and 'pPID.-1' as meaning 'all threads /* Handle both 'pPID' and 'pPID.-1' as meaning 'all threads
of PID'. */ of PID'. */
|| (ptid.pid () == pid_of (thread) || (ptid.pid () == thread->id.pid ()
&& (ptid.is_pid () && (ptid.is_pid ()
|| ptid.lwp () == -1))) || ptid.lwp () == -1)))
{ {
@ -5975,7 +5974,7 @@ linux_process_target::handle_new_gdb_connection ()
else else
{ {
/* Already stopped; go ahead and set the ptrace options. */ /* Already stopped; go ahead and set the ptrace options. */
struct process_info *proc = find_process_pid (pid_of (thread)); process_info *proc = find_process_pid (thread->id.pid ());
int options = linux_low_ptrace_options (proc->attached); int options = linux_low_ptrace_options (proc->attached);
linux_enable_event_reporting (thread->id.lwp (), options); linux_enable_event_reporting (thread->id.lwp (), options);

2
gdbserver/linux-s390-low.cc
View File

@ -589,7 +589,7 @@ s390_target::low_arch_setup ()
struct regset_info *regset; struct regset_info *regset;
/* Determine word size and HWCAP. */ /* Determine word size and HWCAP. */
int pid = pid_of (current_thread); int pid = current_thread->id.pid ();
int wordsize = s390_get_wordsize (pid); int wordsize = s390_get_wordsize (pid);
unsigned long hwcap = linux_get_hwcap (pid, wordsize); unsigned long hwcap = linux_get_hwcap (pid, wordsize);

2
gdbserver/server.cc
View File

@ -1823,7 +1823,7 @@ handle_qxfer_exec_file (const char *annex,
if (current_thread == NULL) if (current_thread == NULL)
return -1; return -1;
pid = pid_of (current_thread); pid = current_thread->id.pid ();
} }
else else
{ {