gdbserver: turn target op 'join' into a method
gdbserver/ChangeLog: 2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> Turn process_stratum_target's join op into a method of process_target. * target.h (struct process_stratum_target): Remove the target op. (class process_target): Add the target op. (join_inferior): Update the macro. Update the derived classes and callers below. * linux-low.cc (linux_target_ops): Update. (linux_join): Turn into ... (linux_process_target::join): ... this. * linux-low.h (class linux_process_target): Update. * lynx-low.cc (lynx_target_ops): Update. (lynx_join): Turn into ... (lynx_process_target::join): ... this. * lynx-low.h (class lynx_process_target): Update. * nto-low.cc (nto_target_ops): Update. (nto_process_target::join): Define. * nto-low.h (class nto_process_target): Update. * win32-low.cc (win32_target_ops): Update. (win32_join): Turn into ... (win32_process_target::join): ... this. * win32-low.h (class win32_process_target): Update.
This commit is contained in:
parent
8adb37b9c0
commit
95a49a3939
|
@ -1,3 +1,30 @@
|
|||
2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
|
||||
|
||||
Turn process_stratum_target's join op into a method of
|
||||
process_target.
|
||||
|
||||
* target.h (struct process_stratum_target): Remove the target op.
|
||||
(class process_target): Add the target op.
|
||||
(join_inferior): Update the macro.
|
||||
|
||||
Update the derived classes and callers below.
|
||||
|
||||
* linux-low.cc (linux_target_ops): Update.
|
||||
(linux_join): Turn into ...
|
||||
(linux_process_target::join): ... this.
|
||||
* linux-low.h (class linux_process_target): Update.
|
||||
* lynx-low.cc (lynx_target_ops): Update.
|
||||
(lynx_join): Turn into ...
|
||||
(lynx_process_target::join): ... this.
|
||||
* lynx-low.h (class lynx_process_target): Update.
|
||||
* nto-low.cc (nto_target_ops): Update.
|
||||
(nto_process_target::join): Define.
|
||||
* nto-low.h (class nto_process_target): Update.
|
||||
* win32-low.cc (win32_target_ops): Update.
|
||||
(win32_join): Turn into ...
|
||||
(win32_process_target::join): ... this.
|
||||
* win32-low.h (class win32_process_target): Update.
|
||||
|
||||
2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
|
||||
|
||||
Turn process_stratum_target's mourn op into a method of
|
||||
|
|
|
@ -1669,8 +1669,8 @@ linux_process_target::mourn (process_info *process)
|
|||
remove_process (process);
|
||||
}
|
||||
|
||||
static void
|
||||
linux_join (int pid)
|
||||
void
|
||||
linux_process_target::join (int pid)
|
||||
{
|
||||
int status, ret;
|
||||
|
||||
|
@ -7358,7 +7358,6 @@ linux_get_hwcap2 (int wordsize)
|
|||
static linux_process_target the_linux_target;
|
||||
|
||||
static process_stratum_target linux_target_ops = {
|
||||
linux_join,
|
||||
linux_thread_alive,
|
||||
linux_resume,
|
||||
linux_wait,
|
||||
|
|
|
@ -282,6 +282,8 @@ public:
|
|||
int detach (process_info *proc) override;
|
||||
|
||||
void mourn (process_info *proc) override;
|
||||
|
||||
void join (int pid) override;
|
||||
};
|
||||
|
||||
#define get_thread_lwp(thr) ((struct lwp_info *) (thread_target_data (thr)))
|
||||
|
|
|
@ -561,8 +561,8 @@ lynx_process_target::mourn (struct process_info *proc)
|
|||
|
||||
/* Implement the join target_ops method. */
|
||||
|
||||
static void
|
||||
lynx_join (int pid)
|
||||
void
|
||||
lynx_process_target::join (int pid)
|
||||
{
|
||||
/* The PTRACE_DETACH is sufficient to detach from the process.
|
||||
So no need to do anything extra. */
|
||||
|
@ -726,7 +726,6 @@ static lynx_process_target the_lynx_target;
|
|||
/* The LynxOS target_ops vector. */
|
||||
|
||||
static process_stratum_target lynx_target_ops = {
|
||||
lynx_join,
|
||||
lynx_thread_alive,
|
||||
lynx_resume,
|
||||
lynx_wait,
|
||||
|
|
|
@ -68,6 +68,8 @@ public:
|
|||
int detach (process_info *proc) override;
|
||||
|
||||
void mourn (process_info *proc) override;
|
||||
|
||||
void join (int pid) override;
|
||||
};
|
||||
|
||||
/* The inferior's target description. This is a global because the
|
||||
|
|
|
@ -423,6 +423,12 @@ nto_process_target::mourn (struct process_info *process)
|
|||
remove_process (process);
|
||||
}
|
||||
|
||||
void
|
||||
nto_process_target::join (int pid)
|
||||
{
|
||||
error (_("nto target does not implement the join op"));
|
||||
}
|
||||
|
||||
/* Check if the given thread is alive.
|
||||
|
||||
Return 1 if alive, 0 otherwise. */
|
||||
|
@ -935,7 +941,6 @@ nto_sw_breakpoint_from_kind (int kind, int *size)
|
|||
static nto_process_target the_nto_target;
|
||||
|
||||
static process_stratum_target nto_target_ops = {
|
||||
NULL, /* nto_join */
|
||||
nto_thread_alive,
|
||||
nto_resume,
|
||||
nto_wait,
|
||||
|
|
|
@ -58,6 +58,8 @@ public:
|
|||
int detach (process_info *proc) override;
|
||||
|
||||
void mourn (process_info *proc) override;
|
||||
|
||||
void join (int pid) override;
|
||||
};
|
||||
|
||||
/* The inferior's target description. This is a global because the
|
||||
|
|
|
@ -70,10 +70,6 @@ class process_target;
|
|||
shared code. */
|
||||
struct process_stratum_target
|
||||
{
|
||||
/* Wait for process PID to exit. */
|
||||
|
||||
void (*join) (int pid);
|
||||
|
||||
/* Return 1 iff the thread with process ID PID is alive. */
|
||||
|
||||
int (*thread_alive) (ptid_t pid);
|
||||
|
@ -485,6 +481,9 @@ public:
|
|||
|
||||
/* The inferior process has died. Do what is right. */
|
||||
virtual void mourn (process_info *proc) = 0;
|
||||
|
||||
/* Wait for process PID to exit. */
|
||||
virtual void join (int pid) = 0;
|
||||
};
|
||||
|
||||
extern process_stratum_target *the_target;
|
||||
|
@ -534,7 +533,7 @@ int kill_inferior (process_info *proc);
|
|||
(*the_target->store_registers) (regcache, regno)
|
||||
|
||||
#define join_inferior(pid) \
|
||||
(*the_target->join) (pid)
|
||||
the_target->pt->join (pid)
|
||||
|
||||
#define target_supports_non_stop() \
|
||||
(the_target->supports_non_stop ? (*the_target->supports_non_stop ) () : 0)
|
||||
|
|
|
@ -886,8 +886,8 @@ win32_process_target::mourn (struct process_info *process)
|
|||
|
||||
/* Implementation of target_ops::join. */
|
||||
|
||||
static void
|
||||
win32_join (int pid)
|
||||
void
|
||||
win32_process_target::join (int pid)
|
||||
{
|
||||
HANDLE h = OpenProcess (PROCESS_ALL_ACCESS, FALSE, pid);
|
||||
if (h != NULL)
|
||||
|
@ -1839,7 +1839,6 @@ win32_sw_breakpoint_from_kind (int kind, int *size)
|
|||
static win32_process_target the_win32_target;
|
||||
|
||||
static process_stratum_target win32_target_ops = {
|
||||
win32_join,
|
||||
win32_thread_alive,
|
||||
win32_resume,
|
||||
win32_wait,
|
||||
|
|
|
@ -117,6 +117,8 @@ public:
|
|||
int detach (process_info *proc) override;
|
||||
|
||||
void mourn (process_info *proc) override;
|
||||
|
||||
void join (int pid) override;
|
||||
};
|
||||
|
||||
/* Retrieve the context for this thread, if not already retrieved. */
|
||||
|
|
Loading…
Reference in New Issue