[PATCH v2 30/58] gdbserver: turn target op 'supports_multi_process' into a method
Tankut Baris Aktemur
tankut.baris.aktemur@intel.com
Mon Feb 17 17:01:00 GMT 2020
gdbserver/ChangeLog:
2020-02-10 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Turn process_stratum_target's supports_multi_process op into a
method of process_target.
* target.h (struct process_stratum_target): Remove the target op.
(class process_target): Add the target op.
* target.cc (process_target::supports_multi_process): Define.
(target_supports_multi_process): Update.
Update the derived classes and callers below.
* linux-low.cc (linux_target_ops): Update.
(linux_supports_multi_process): Turn into ...
(linux_process_target::supports_multi_process): ... this.
* linux-low.h (class linux_process_target): Update.
* lynx-low.cc (lynx_target_ops): Update.
* nto-low.cc (nto_target_ops): Update.
* win32-low.cc (win32_target_ops): Update.
---
gdbserver/linux-low.cc | 7 +++----
gdbserver/linux-low.h | 2 ++
gdbserver/lynx-low.cc | 1 -
gdbserver/nto-low.cc | 1 -
gdbserver/target.cc | 9 +++++++--
gdbserver/target.h | 6 +++---
gdbserver/win32-low.cc | 1 -
7 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
index 192989a9a4e..770cf472840 100644
--- a/gdbserver/linux-low.cc
+++ b/gdbserver/linux-low.cc
@@ -6334,10 +6334,10 @@ linux_process_target::start_non_stop (bool nonstop)
return 0;
}
-static int
-linux_supports_multi_process (void)
+bool
+linux_process_target::supports_multi_process ()
{
- return 1;
+ return true;
}
/* Check if fork events are supported. */
@@ -7425,7 +7425,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_supports_multi_process,
linux_supports_fork_events,
linux_supports_vfork_events,
linux_supports_exec_events,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index c5982ca3e5b..58730e2c0a3 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -363,6 +363,8 @@ public:
bool async (bool enable) override;
int start_non_stop (bool enable) override;
+
+ bool supports_multi_process () override;
};
#define get_thread_lwp(thr) ((struct lwp_info *) (thread_target_data (thr)))
diff --git a/gdbserver/lynx-low.cc b/gdbserver/lynx-low.cc
index 15811d2034a..897bc9e663f 100644
--- a/gdbserver/lynx-low.cc
+++ b/gdbserver/lynx-low.cc
@@ -735,7 +735,6 @@ static lynx_process_target the_lynx_target;
/* The LynxOS target_ops vector. */
static process_stratum_target lynx_target_ops = {
- NULL, /* supports_multi_process */
NULL, /* supports_fork_events */
NULL, /* supports_vfork_events */
NULL, /* supports_exec_events */
diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc
index bb0b14aa951..11b290a20a3 100644
--- a/gdbserver/nto-low.cc
+++ b/gdbserver/nto-low.cc
@@ -947,7 +947,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, /* supports_multi_process */
NULL, /* supports_fork_events */
NULL, /* supports_vfork_events */
NULL, /* supports_exec_events */
diff --git a/gdbserver/target.cc b/gdbserver/target.cc
index 33e31a748ef..485eecbee91 100644
--- a/gdbserver/target.cc
+++ b/gdbserver/target.cc
@@ -260,8 +260,7 @@ target_continue (ptid_t ptid, enum gdb_signal signal)
int
target_supports_multi_process (void)
{
- return (the_target->supports_multi_process != NULL ?
- (*the_target->supports_multi_process) () : 0);
+ return the_target->pt->supports_multi_process ();
}
void
@@ -548,3 +547,9 @@ process_target::start_non_stop (bool enable)
else
return 0;
}
+
+bool
+process_target::supports_multi_process ()
+{
+ return false;
+}
diff --git a/gdbserver/target.h b/gdbserver/target.h
index d3ee4452b63..52c80b848d0 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,9 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Returns true if the target supports multi-process debugging. */
- int (*supports_multi_process) (void);
-
/* Returns true if fork events are supported. */
int (*supports_fork_events) (void);
@@ -486,6 +483,9 @@ public:
/* Switch to non-stop (ENABLE == true) or all-stop (ENABLE == false)
mode. Return 0 on success, -1 otherwise. */
virtual int start_non_stop (bool enable);
+
+ /* Returns true if the target supports multi-process debugging. */
+ virtual bool supports_multi_process ();
};
extern process_stratum_target *the_target;
diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc
index 60a7f475f84..ee7a0ea92a6 100644
--- a/gdbserver/win32-low.cc
+++ b/gdbserver/win32-low.cc
@@ -1852,7 +1852,6 @@ win32_sw_breakpoint_from_kind (int kind, int *size)
static win32_process_target the_win32_target;
static process_stratum_target win32_target_ops = {
- NULL, /* supports_multi_process */
NULL, /* supports_fork_events */
NULL, /* supports_vfork_events */
NULL, /* supports_exec_events */
--
2.17.1
More information about the Gdb-patches
mailing list