[PATCH 04/58] gdbserver: turn target op 'attach' into a method
Tankut Baris Aktemur
tankut.baris.aktemur@intel.com
Tue Feb 11 09:03:00 GMT 2020
gdbserver/ChangeLog:
2020-02-10 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Make process_stratum_target's attach op a method of
process_target.
* target.h (struct process_stratum_target): Remove the target op.
(class process_target): Add the target op.
(myattach): Update the macro.
Update the derived structs and callers below.
* linux-low.c (linux_target_ops): Update.
(linux_attach): Turn into ...
(linux_process_target::attach): ... this.
* linux-low.h (class linux_process_target): Update.
* lynx-low.c (lynx_target_ops): Update.
(lynx_attach): Turn into ...
(lynx_process_target::attach): ... this.
* lynx-low.h (class lynx_process_target): Update.
* nto-low.c (nto_target_ops): Update.
(nto_attach): Turn into ...
(nto_process_target::attach): ... this.
* nto-low.h (class nto_process_target): Update.
* win32-low.c (win32_target_ops): Update.
(win32_attach): Turn into ...
(win32_process_target::attach): ... this.
* win32-low.h (class win32_process_target): Update.
---
gdbserver/linux-low.c | 5 ++---
gdbserver/linux-low.h | 2 ++
gdbserver/lynx-low.c | 5 ++---
gdbserver/lynx-low.h | 2 ++
gdbserver/nto-low.c | 5 ++---
gdbserver/nto-low.h | 2 ++
gdbserver/target.h | 21 ++++++++++-----------
gdbserver/win32-low.c | 5 ++---
gdbserver/win32-low.h | 2 ++
9 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c
index 9e4c6758581..8e62ed91a77 100644
--- a/gdbserver/linux-low.c
+++ b/gdbserver/linux-low.c
@@ -1181,8 +1181,8 @@ static void async_file_mark (void);
/* Attach to PID. If PID is the tgid, attach to it and all
of its threads. */
-static int
-linux_attach (unsigned long pid)
+int
+linux_process_target::attach (unsigned long pid)
{
struct process_info *proc;
struct thread_info *initial_thread;
@@ -7359,7 +7359,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_attach,
linux_kill,
linux_detach,
linux_mourn,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index fab08a6bb7d..673c5bbc407 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -273,6 +273,8 @@ public:
const std::vector<char *> &program_args) override;
void post_create_inferior () override;
+
+ int attach (unsigned long pid) override;
};
#define get_thread_lwp(thr) ((struct lwp_info *) (thread_target_data (thr)))
diff --git a/gdbserver/lynx-low.c b/gdbserver/lynx-low.c
index c6880bc7bc2..2e2535e1d61 100644
--- a/gdbserver/lynx-low.c
+++ b/gdbserver/lynx-low.c
@@ -309,8 +309,8 @@ lynx_add_threads_after_attach (int pid)
/* Implement the attach target_ops method. */
-static int
-lynx_attach (unsigned long pid)
+int
+lynx_process_target::attach (unsigned long pid)
{
ptid_t ptid = lynx_ptid_t (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_attach,
lynx_kill,
lynx_detach,
lynx_mourn,
diff --git a/gdbserver/lynx-low.h b/gdbserver/lynx-low.h
index e74d80be5b4..7a3f03fb36e 100644
--- a/gdbserver/lynx-low.h
+++ b/gdbserver/lynx-low.h
@@ -59,6 +59,8 @@ public:
int create_inferior (const char *program,
const std::vector<char *> &program_args) override;
+
+ int attach (unsigned long pid) override;
};
/* The inferior's target description. This is a global because the
diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c
index ce37443385d..47be6eeab86 100644
--- a/gdbserver/nto-low.c
+++ b/gdbserver/nto-low.c
@@ -385,8 +385,8 @@ nto_process_target::create_inferior (
/* Attach to process PID. */
-static int
-nto_attach (unsigned long pid)
+int
+nto_process_target::attach (unsigned long pid)
{
TRACE ("%s %ld\n", __func__, pid);
if (do_attach (pid) != pid)
@@ -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_attach,
nto_kill,
nto_detach,
nto_mourn,
diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h
index cc028d7e07d..e5d2fa83135 100644
--- a/gdbserver/nto-low.h
+++ b/gdbserver/nto-low.h
@@ -49,6 +49,8 @@ public:
int create_inferior (const char *program,
const std::vector<char *> &program_args) override;
+
+ int attach (unsigned long pid) override;
};
/* The inferior's target description. This is a global because the
diff --git a/gdbserver/target.h b/gdbserver/target.h
index bede0a8556c..a2bbfed5b07 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,16 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Attach to a running process.
-
- PID is the process ID to attach to, specified by the user
- or a higher layer.
-
- Returns -1 if attaching is unsupported, 0 on success, and calls
- error() otherwise. */
-
- int (*attach) (unsigned long pid);
-
/* Kill process PROC. Return -1 on failure, and 0 on success. */
int (*kill) (process_info *proc);
@@ -488,6 +478,15 @@ public:
/* Do additional setup after a new process is created, including
exec-wrapper completion. */
virtual void post_create_inferior ();
+
+ /* Attach to a running process.
+
+ PID is the process ID to attach to, specified by the user
+ or a higher layer.
+
+ Returns -1 if attaching is unsupported, 0 on success, and calls
+ error() otherwise. */
+ virtual int attach (unsigned long pid) = 0;
};
extern process_stratum_target *the_target;
@@ -501,7 +500,7 @@ void set_target_ops (process_stratum_target *);
the_target->pt->post_create_inferior ()
#define myattach(pid) \
- (*the_target->attach) (pid)
+ the_target->pt->attach (pid)
int kill_inferior (process_info *proc);
diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c
index e8d4347a4b9..1acab18d09f 100644
--- a/gdbserver/win32-low.c
+++ b/gdbserver/win32-low.c
@@ -715,8 +715,8 @@ win32_process_target::create_inferior (
/* Attach to a running process.
PID is the process ID to attach to, specified by the user
or a higher layer. */
-static int
-win32_attach (unsigned long pid)
+int
+win32_process_target::attach (unsigned long pid)
{
HANDLE h;
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_attach,
win32_kill,
win32_detach,
win32_mourn,
diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h
index 661d8a385c1..f626db6cf60 100644
--- a/gdbserver/win32-low.h
+++ b/gdbserver/win32-low.h
@@ -108,6 +108,8 @@ public:
int create_inferior (const char *program,
const std::vector<char *> &program_args) override;
+
+ int attach (unsigned long pid) override;
};
/* Retrieve the context for this thread, if not already retrieved. */
--
2.17.1
More information about the Gdb-patches
mailing list