From: Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 29/58] gdbserver: turn non-stop and async target ops into methods
Date: Tue, 11 Feb 2020 09:05:00 -0000 [thread overview]
Message-ID: <8a8f4a556c9c0344bbeffb262489503bb998dea6.1581410934.git.tankut.baris.aktemur@intel.com> (raw)
In-Reply-To: <cover.1581410932.git.tankut.baris.aktemur@intel.com>
In-Reply-To: <cover.1581410932.git.tankut.baris.aktemur@intel.com>
gdbserver/ChangeLog:
2020-02-10 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Make process_stratum_target's supports_non_stop, async, and
start_non_stop ops methods of process_target.
* target.h (struct process_stratum_target): Remove the target ops.
(class process_target): Add the target ops.
(target_supports_non_stop): Update the macro.
(target_async): Update the macro.
(start_non_stop): Remove declaration.
* target.c (process_target::supports_non_stop): Define.
(process_target::async): Define.
(process_target::start_non_stop): Define.
(start_non_stop): Remove.
Update the derived structs and callers below.
* server.c (handle_qxfer_siginfo): Update.
(handle_query): Update.
* linux-low.c (linux_target_ops): Update.
(linux_supports_non_stop): Turn into ...
(linux_process_target::supports_non_stop): ... this.
(linux_async): Turn into ...
(linux_process_target::async): ... this.
(linux_start_non_stop): Turn into ...
(linux_process_target::start_non_stop): ... this.
* linux-low.h (class linux_process_target): Update.
* lynx-low.c (lynx_target_ops): Update.
* nto-low.c (nto_target_ops): Update.
(nto_supports_non_stop): Remove; rely on the default behavior
instead.
* win32-low.c (win32_target_ops): Update.
---
gdbserver/linux-low.c | 23 ++++++++++-------------
gdbserver/linux-low.h | 6 ++++++
gdbserver/lynx-low.c | 3 ---
gdbserver/nto-low.c | 12 ------------
gdbserver/server.c | 6 +++---
gdbserver/target.c | 35 +++++++++++++++++++++--------------
gdbserver/target.h | 29 +++++++++++++----------------
gdbserver/win32-low.c | 3 ---
8 files changed, 53 insertions(+), 64 deletions(-)
diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c
index 387e160b8de..a13edfd067b 100644
--- a/gdbserver/linux-low.c
+++ b/gdbserver/linux-low.c
@@ -6254,16 +6254,16 @@ sigchld_handler (int signo)
errno = old_errno;
}
-static int
-linux_supports_non_stop (void)
+bool
+linux_process_target::supports_non_stop ()
{
- return 1;
+ return true;
}
-static int
-linux_async (int enable)
+bool
+linux_process_target::async (bool enable)
{
- int previous = target_is_async_p ();
+ bool previous = target_is_async_p ();
if (debug_threads)
debug_printf ("linux_async (%d), previous=%d\n",
@@ -6315,13 +6315,13 @@ linux_async (int enable)
return previous;
}
-static int
-linux_start_non_stop (int nonstop)
+int
+linux_process_target::start_non_stop (bool nonstop)
{
/* Register or unregister from event-loop accordingly. */
- linux_async (nonstop);
+ target_async (nonstop);
- if (target_is_async_p () != (nonstop != 0))
+ if (target_is_async_p () != (nonstop != false))
return -1;
return 0;
@@ -7418,9 +7418,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_supports_non_stop,
- linux_async,
- linux_start_non_stop,
linux_supports_multi_process,
linux_supports_fork_events,
linux_supports_vfork_events,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index a008dac66f4..0f1dfa45fba 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -360,6 +360,12 @@ public:
int qxfer_siginfo (const char *annex, unsigned char *readbuf,
unsigned const char *writebuf,
CORE_ADDR offset, int len) override;
+
+ bool supports_non_stop () override;
+
+ bool async (bool enable) override;
+
+ int start_non_stop (bool enable) 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 d45e598cb26..ad2c2f72a73 100644
--- a/gdbserver/lynx-low.c
+++ b/gdbserver/lynx-low.c
@@ -735,9 +735,6 @@ static lynx_process_target the_lynx_target;
/* The LynxOS target_ops vector. */
static process_stratum_target lynx_target_ops = {
- NULL, /* supports_non_stop */
- NULL, /* async */
- NULL, /* start_non_stop */
NULL, /* supports_multi_process */
NULL, /* supports_fork_events */
NULL, /* supports_vfork_events */
diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c
index 4d3ef38a976..cbbf67af917 100644
--- a/gdbserver/nto-low.c
+++ b/gdbserver/nto-low.c
@@ -933,15 +933,6 @@ nto_process_target::stopped_data_address ()
return ret;
}
-/* We do not currently support non-stop. */
-
-static int
-nto_supports_non_stop (void)
-{
- TRACE ("%s\n", __func__);
- return 0;
-}
-
/* Implementation of the target_ops method "sw_breakpoint_from_kind". */
static const gdb_byte *
@@ -956,9 +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 = {
- nto_supports_non_stop,
- NULL, /* async */
- NULL, /* start_non_stop */
NULL, /* supports_multi_process */
NULL, /* supports_fork_events */
NULL, /* supports_vfork_events */
diff --git a/gdbserver/server.c b/gdbserver/server.c
index ece75f01868..f427e7706fb 100644
--- a/gdbserver/server.c
+++ b/gdbserver/server.c
@@ -740,7 +740,7 @@ handle_general_set (char *own_buf)
}
req_str = req ? "non-stop" : "all-stop";
- if (start_non_stop (req) != 0)
+ if (the_target->pt->start_non_stop (req == 1) != 0)
{
fprintf (stderr, "Setting %s mode failed\n", req_str);
write_enn (own_buf);
@@ -1234,7 +1234,7 @@ handle_detach (char *own_buf)
debug_printf ("Forcing non-stop mode\n");
non_stop = true;
- start_non_stop (1);
+ the_target->pt->start_non_stop (true);
}
process->gdb_detached = 1;
@@ -3885,7 +3885,7 @@ captured_main (int argc, char *argv[])
down without informing GDB. */
if (!non_stop)
{
- if (start_non_stop (1))
+ if (the_target->pt->start_non_stop (true))
non_stop = 1;
/* Detaching implicitly resumes all threads;
diff --git a/gdbserver/target.c b/gdbserver/target.c
index 94bb45fcace..33e31a748ef 100644
--- a/gdbserver/target.c
+++ b/gdbserver/target.c
@@ -264,20 +264,6 @@ target_supports_multi_process (void)
(*the_target->supports_multi_process) () : 0);
}
-int
-start_non_stop (int nonstop)
-{
- if (the_target->start_non_stop == NULL)
- {
- if (nonstop)
- return -1;
- else
- return 0;
- }
-
- return (*the_target->start_non_stop) (nonstop);
-}
-
void
set_target_ops (process_stratum_target *target)
{
@@ -541,3 +527,24 @@ process_target::qxfer_siginfo (const char *annex, unsigned char *readbuf,
{
gdb_assert_not_reached ("target op qxfer_siginfo not supported");
}
+
+bool
+process_target::supports_non_stop ()
+{
+ return false;
+}
+
+bool
+process_target::async (bool enable)
+{
+ return false;
+}
+
+int
+process_target::start_non_stop (bool enable)
+{
+ if (enable)
+ return -1;
+ else
+ return 0;
+}
diff --git a/gdbserver/target.h b/gdbserver/target.h
index bec147de089..88b4762a30c 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,16 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- int (*supports_non_stop) (void);
-
- /* Enables async target events. Returns the previous enable
- state. */
- int (*async) (int enable);
-
- /* Switch to non-stop (1) or all-stop (0) mode. Return 0 on
- success, -1 otherwise. */
- int (*start_non_stop) (int);
-
/* Returns true if the target supports multi-process debugging. */
int (*supports_multi_process) (void);
@@ -485,6 +475,17 @@ public:
virtual int qxfer_siginfo (const char *annex, unsigned char *readbuf,
unsigned const char *writebuf,
CORE_ADDR offset, int len);
+
+ /* Return true if non-stop mode is supported. */
+ virtual bool supports_non_stop ();
+
+ /* Enables async target events. Returns the previous enable
+ state. */
+ virtual bool async (bool enable);
+
+ /* 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);
};
extern process_stratum_target *the_target;
@@ -537,10 +538,10 @@ int kill_inferior (process_info *proc);
the_target->pt->join (pid)
#define target_supports_non_stop() \
- (the_target->supports_non_stop ? (*the_target->supports_non_stop ) () : 0)
+ the_target->pt->supports_non_stop ()
#define target_async(enable) \
- (the_target->async ? (*the_target->async) (enable) : 0)
+ the_target->pt->async (enable)
#define target_process_qsupported(features, count) \
do \
@@ -696,10 +697,6 @@ target_read_btrace_conf (struct btrace_target_info *tinfo,
(the_target->supports_software_single_step ? \
(*the_target->supports_software_single_step) () : 0)
-/* Start non-stop mode, returns 0 on success, -1 on failure. */
-
-int start_non_stop (int nonstop);
-
ptid_t mywait (ptid_t ptid, struct target_waitstatus *ourstatus, int options,
int connected_wait);
diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c
index 45fd49458e7..15431047814 100644
--- a/gdbserver/win32-low.c
+++ b/gdbserver/win32-low.c
@@ -1842,9 +1842,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_non_stop */
- NULL, /* async */
- NULL, /* start_non_stop */
NULL, /* supports_multi_process */
NULL, /* supports_fork_events */
NULL, /* supports_vfork_events */
--
2.17.1
next prev parent reply other threads:[~2020-02-11 9:03 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-11 9:02 [PATCH 00/58] Turn gdbserver's process_stratum_target into a class Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 11/58] gdbserver: turn target op 'wait' into a method Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 46/58] gdbserver: turn target op 'qxfer_libraries_svr4' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 18/58] gdbserver: turn target op 'supports_z_point_type' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 13/58] gdbserver: turn prepare_to_access_memory & done_accessing_memory into methods Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 15/58] gdbserver: turn target op 'look_up_symbols' into a method Tankut Baris Aktemur
2020-02-13 20:28 ` Pedro Alves
2020-02-11 9:03 ` [PATCH 05/58] gdbserver: turn target op 'kill' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 19/58] gdbserver: turn target ops 'insert_point' and 'remove_point' into methods Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 27/58] gdbserver: turn target op 'qxfer_osdata' into a method Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 45/58] gdbserver: turn target op 'supports_disable_randomization' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 02/58] gdbserver: turn target op 'create_inferior' " Tankut Baris Aktemur
2020-02-13 20:27 ` Pedro Alves
2020-02-14 11:01 ` Aktemur, Tankut Baris
2020-02-14 13:07 ` Pedro Alves
2020-02-11 9:03 ` [PATCH 36/58] gdbserver: turn target op 'process_qsupported' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 40/58] gdbserver: turn target op 'get_tib_address' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 01/58] gdbserver: start turning the target ops vector into a class Tankut Baris Aktemur
2020-02-13 20:26 ` Pedro Alves
2020-02-11 9:03 ` [PATCH 32/58] gdbserver: turn target op 'handle_new_gdb_connection' into a method Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 43/58] gdbserver: turn fast tracepoint target ops into methods Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 08/58] gdbserver: turn target op 'join' into a method Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 03/58] gdbserver: turn target op 'post_create_inferior' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 21/58] gdbserver: turn target op '{supports_}stopped_by_hw_breakpoint' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 25/58] gdbserver: turn target op 'get_tls_address' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 23/58] gdbserver: turn target ops 'stopped_by_watchpoint' and 'stopped_data_address' into methods Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 09/58] gdbserver: turn target op 'thread_alive' into a method Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 37/58] gdbserver: turn target op 'supports_tracepoints' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 24/58] gdbserver: turn target op 'read_offsets' " Tankut Baris Aktemur
2020-02-13 20:29 ` Pedro Alves
2020-02-11 9:03 ` [PATCH 33/58] gdbserver: turn target op 'handle_monitor_command' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 07/58] gdbserver: turn target op 'mourn' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 20/58] gdbserver: turn target op '{supports_}stopped_by_sw_breakpoint' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 12/58] gdbserver: turn target ops 'fetch_registers' and 'store_registers' into methods Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 06/58] gdbserver: turn target op 'detach' into a method Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 48/58] gdbserver: turn btrace-related target ops into methods Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 28/58] gdbserver: turn target op 'qxfer_siginfo' into a method Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 26/58] gdbserver: turn target op 'hostio_last_error' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 22/58] gdbserver: turn target op 'supports_hardware_single_step' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 04/58] gdbserver: turn target op 'attach' " Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 55/58] gdbserver: turn target op 'supports_catch_syscall' " Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 50/58] gdbserver: turn target op 'pid_to_exec_file' " Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 38/58] gdbserver: turn target ops 'read_pc' and 'write_pc' into methods Tankut Baris Aktemur
2020-02-13 20:29 ` Pedro Alves
2020-02-11 9:04 ` [PATCH 57/58] gdbserver: use unique_ptr for 'the_target' Tankut Baris Aktemur
2020-02-11 16:43 ` Christian Biesinger via gdb-patches
2020-02-12 8:32 ` Aktemur, Tankut Baris
2020-02-13 20:31 ` Pedro Alves
2020-02-11 9:04 ` [PATCH 31/58] gdbserver: turn target ops 'supports_{fork,vfork,exec}_events' into methods Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 56/58] gdbserver: turn target op 'get_ipa_tdesc_idx' into a method Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 53/58] gdbserver: turn target ops 'thread_name' and 'thread_handle' into methods Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 42/58] gdbserver: turn target op 'stabilize_threads' into a method Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 17/58] gdbserver: turn target op 'read_auxv' " Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 54/58] gdbserver: turn target op 'supports_software_single_step' " Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 52/58] gdbserver: turn breakpoint kind-related target ops into methods Tankut Baris Aktemur
2020-02-13 20:29 ` Pedro Alves
2020-02-11 9:04 ` [PATCH 34/58] gdbserver: turn target op 'core_of_thread' into a method Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 39/58] gdbserver: turn target op 'thread_stopped' " Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 47/58] gdbserver: turn target op 'supports_agent' " Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 49/58] gdbserver: turn target op 'supports_range_stepping' " Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 14/58] gdbserver: turn target ops 'read_memory' and 'write_memory' into methods Tankut Baris Aktemur
2020-02-11 9:05 ` [PATCH 41/58] gdbserver: turn target ops 'pause_all' and 'unpause_all' " Tankut Baris Aktemur
2020-02-11 9:05 ` [PATCH 16/58] gdbserver: turn target op 'request_interrupt' into a method Tankut Baris Aktemur
2020-02-11 9:05 ` [PATCH 51/58] gdbserver: turn target ops 'multifs_{open, readlink, unlink}' into methods Tankut Baris Aktemur
2020-02-11 9:05 ` [PATCH 35/58] gdbserver: turn target op 'read_loadmap' into a method Tankut Baris Aktemur
2020-02-11 9:05 ` [PATCH 10/58] gdbserver: turn target op 'resume' " Tankut Baris Aktemur
2020-02-11 9:05 ` Tankut Baris Aktemur [this message]
2020-02-11 9:05 ` [PATCH 58/58] gdbserver: finish turning the target ops vector into a class Tankut Baris Aktemur
2020-02-13 20:31 ` Pedro Alves
2020-02-11 9:05 ` [PATCH 30/58] gdbserver: turn target op 'supports_multi_process' into a method Tankut Baris Aktemur
2020-02-11 9:05 ` [PATCH 44/58] gdbserver: turn target op 'emit_ops' " Tankut Baris Aktemur
2020-02-11 17:41 ` [PATCH 00/58] Turn gdbserver's process_stratum_target into a class Christian Biesinger via gdb-patches
2020-02-12 8:18 ` Aktemur, Tankut Baris
2020-02-12 16:43 ` Christian Biesinger via gdb-patches
2020-02-13 20:26 ` Pedro Alves
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8a8f4a556c9c0344bbeffb262489503bb998dea6.1581410934.git.tankut.baris.aktemur@intel.com \
--to=tankut.baris.aktemur@intel.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).