@@ -1603,8 +1603,8 @@ linux_detach_lwp_callback (thread_info *thread)
linux_detach_one_lwp (lwp);
}
-static int
-linux_detach (process_info *process)
+int
+linux_process_target::detach (process_info *process)
{
struct lwp_info *main_lwp;
@@ -7359,7 +7359,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_detach,
linux_mourn,
linux_join,
linux_thread_alive,
@@ -277,6 +277,8 @@ public:
int attach (unsigned long pid) override;
int kill (process_info *proc) override;
+
+ int detach (process_info *proc) override;
};
#define get_thread_lwp(thr) ((struct lwp_info *) (thread_target_data (thr)))
@@ -535,8 +535,8 @@ lynx_process_target::kill (process_info *process)
/* Implement the detach target_ops method. */
-static int
-lynx_detach (process_info *process)
+int
+lynx_process_target::detach (process_info *process)
{
ptid_t ptid = lynx_ptid_t (process->pid, 0);
@@ -726,7 +726,6 @@ static lynx_process_target the_lynx_target;
/* The LynxOS target_ops vector. */
static process_stratum_target lynx_target_ops = {
- lynx_detach,
lynx_mourn,
lynx_join,
lynx_thread_alive,
@@ -63,6 +63,8 @@ public:
int attach (unsigned long pid) override;
int kill (process_info *proc) override;
+
+ int detach (process_info *proc) override;
};
/* The inferior's target description. This is a global because the
@@ -409,8 +409,8 @@ nto_process_target::kill (process_info *proc)
/* Detach from process PID. */
-static int
-nto_detach (process_info *proc)
+int
+nto_process_target::detach (process_info *proc)
{
TRACE ("%s %d\n", __func__, proc->pid);
do_detach ();
@@ -935,7 +935,6 @@ nto_sw_breakpoint_from_kind (int kind, int *size)
static nto_process_target the_nto_target;
static process_stratum_target nto_target_ops = {
- nto_detach,
nto_mourn,
NULL, /* nto_join */
nto_thread_alive,
@@ -53,6 +53,8 @@ public:
int attach (unsigned long pid) override;
int kill (process_info *proc) override;
+
+ int detach (process_info *proc) override;
};
/* The inferior's target description. This is a global because the
@@ -70,11 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Detach from process PROC. Return -1 on failure, and 0 on
- success. */
-
- int (*detach) (process_info *proc);
-
/* The inferior process has died. Do what is right. */
void (*mourn) (struct process_info *proc);
@@ -486,6 +481,10 @@ public:
/* Kill process PROC. Return -1 on failure, and 0 on success. */
virtual int kill (process_info *proc) = 0;
+
+ /* Detach from process PROC. Return -1 on failure, and 0 on
+ success. */
+ virtual int detach (process_info *proc) = 0;
};
extern process_stratum_target *the_target;
@@ -523,7 +522,7 @@ int kill_inferior (process_info *proc);
} while (0)
#define detach_inferior(proc) \
- (*the_target->detach) (proc)
+ the_target->pt->detach (proc)
#define mythread_alive(pid) \
(*the_target->thread_alive) (pid)
@@ -832,8 +832,8 @@ win32_process_target::kill (process_info *process)
/* Implementation of target_ops::detach. */
-static int
-win32_detach (process_info *process)
+int
+win32_process_target::detach (process_info *process)
{
winapi_DebugActiveProcessStop DebugActiveProcessStop = NULL;
winapi_DebugSetProcessKillOnExit DebugSetProcessKillOnExit = NULL;
@@ -1828,7 +1828,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_detach,
win32_mourn,
win32_join,
win32_thread_alive,
@@ -112,6 +112,8 @@ public:
int attach (unsigned long pid) override;
int kill (process_info *proc) override;
+
+ int detach (process_info *proc) override;
};
/* Retrieve the context for this thread, if not already retrieved. */