From: Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 11/58] gdbserver: turn target op 'wait' into a method
Date: Tue, 11 Feb 2020 09:03:00 -0000 [thread overview]
Message-ID: <78de6d2be971d05f6f637b260555440ade8cee95.1581410933.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 wait op a method of
process_target.
* target.h (struct process_stratum_target): Remove the target op.
(class process_target): Add the target op.
Update the derived structs and callers below.
* target.c (target_wait): Update.
* linux-low.c (linux_target_ops): Update.
(linux_wait): Turn into ...
(linux_process_target::wait): ... this.
* linux-low.h (class linux_process_target): Update.
* lynx-low.c (lynx_target_ops): Update.
(lynx_wait): Turn into ...
(lynx_process_target::wait): ... this.
* lynx-low.h (class lynx_process_target): Update.
* nto-low.c (nto_target_ops): Update.
(nto_wait): Turn into ...
(nto_process_target::wait): ... this.
* nto-low.h (class nto_process_target): Update.
* win32-low.c (win32_target_ops): Update.
(win32_wait): Turn into ...
(win32_process_target::wait): ... this.
(do_initial_child_stuff): Update.
* win32-low.h (class win32_process_target): Update.
---
gdbserver/linux-low.c | 8 ++++----
gdbserver/linux-low.h | 3 +++
gdbserver/lynx-low.c | 6 +++---
gdbserver/lynx-low.h | 3 +++
gdbserver/nto-low.c | 7 +++----
gdbserver/nto-low.h | 3 +++
gdbserver/target.c | 2 +-
gdbserver/target.h | 26 +++++++++++++-------------
gdbserver/win32-low.c | 12 +++++-------
gdbserver/win32-low.h | 3 +++
10 files changed, 41 insertions(+), 32 deletions(-)
diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c
index 5722752fd12..9f6f1064f45 100644
--- a/gdbserver/linux-low.c
+++ b/gdbserver/linux-low.c
@@ -3833,9 +3833,10 @@ async_file_mark (void)
be awakened anyway. */
}
-static ptid_t
-linux_wait (ptid_t ptid,
- struct target_waitstatus *ourstatus, int target_options)
+ptid_t
+linux_process_target::wait (ptid_t ptid,
+ target_waitstatus *ourstatus,
+ int target_options)
{
ptid_t event_ptid;
@@ -7358,7 +7359,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_wait,
linux_fetch_registers,
linux_store_registers,
linux_prepare_to_access_memory,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index 48d92f73ced..c402d8e1c94 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -287,6 +287,9 @@ public:
bool thread_alive (ptid_t pid) override;
void resume (thread_resume *resume_info, size_t n) override;
+
+ ptid_t wait (ptid_t ptid, target_waitstatus *status,
+ int options) 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 b3eacd8b6c2..24830d1c289 100644
--- a/gdbserver/lynx-low.c
+++ b/gdbserver/lynx-low.c
@@ -505,8 +505,9 @@ retry:
/* A wrapper around lynx_wait_1 that also prints debug traces when
such debug traces have been activated. */
-static ptid_t
-lynx_wait (ptid_t ptid, struct target_waitstatus *status, int options)
+ptid_t
+lynx_process_target::wait (ptid_t ptid, target_waitstatus *status,
+ int options)
{
ptid_t new_ptid;
@@ -726,7 +727,6 @@ static lynx_process_target the_lynx_target;
/* The LynxOS target_ops vector. */
static process_stratum_target lynx_target_ops = {
- lynx_wait,
lynx_fetch_registers,
lynx_store_registers,
NULL, /* prepare_to_access_memory */
diff --git a/gdbserver/lynx-low.h b/gdbserver/lynx-low.h
index 6ad41545679..1b21ffb4c0a 100644
--- a/gdbserver/lynx-low.h
+++ b/gdbserver/lynx-low.h
@@ -73,6 +73,9 @@ public:
bool thread_alive (ptid_t pid) override;
void resume (thread_resume *resume_info, size_t n) override;
+
+ ptid_t wait (ptid_t ptid, target_waitstatus *status,
+ int options) 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 aba63786203..462936f5eb7 100644
--- a/gdbserver/nto-low.c
+++ b/gdbserver/nto-low.c
@@ -518,9 +518,9 @@ nto_process_target::resume (thread_resume *resume_info, size_t n)
Return ptid of thread that caused the event. */
-static ptid_t
-nto_wait (ptid_t ptid,
- struct target_waitstatus *ourstatus, int target_options)
+ptid_t
+nto_process_target::wait (ptid_t ptid, target_waitstatus *ourstatus,
+ int target_options)
{
sigset_t set;
siginfo_t info;
@@ -941,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 = {
- nto_wait,
nto_fetch_registers,
nto_store_registers,
NULL, /* prepare_to_access_memory */
diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h
index b0ca4247e69..faa7cab2941 100644
--- a/gdbserver/nto-low.h
+++ b/gdbserver/nto-low.h
@@ -63,6 +63,9 @@ public:
bool thread_alive (ptid_t pid) override;
void resume (thread_resume *resume_info, size_t n) override;
+
+ ptid_t wait (ptid_t ptid, target_waitstatus *status,
+ int options) override;
};
/* The inferior's target description. This is a global because the
diff --git a/gdbserver/target.c b/gdbserver/target.c
index eca53de982e..b73c4465f1c 100644
--- a/gdbserver/target.c
+++ b/gdbserver/target.c
@@ -223,7 +223,7 @@ target_stop_and_wait (ptid_t ptid)
ptid_t
target_wait (ptid_t ptid, struct target_waitstatus *status, int options)
{
- return (*the_target->wait) (ptid, status, options);
+ return the_target->pt->wait (ptid, status, options);
}
/* See target/target.h. */
diff --git a/gdbserver/target.h b/gdbserver/target.h
index 0a07d7f8c85..43532161f34 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,19 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Wait for the inferior process or thread to change state. Store
- status through argument pointer STATUS.
-
- PTID = -1 to wait for any pid to do something, PTID(pid,0,0) to
- wait for any thread of process pid to do something. Return ptid
- of child, or -1 in case of error; store status through argument
- pointer STATUS. OPTIONS is a bit set of options defined as
- TARGET_W* above. If options contains TARGET_WNOHANG and there's
- no child stop to report, return is
- null_ptid/TARGET_WAITKIND_IGNORE. */
-
- ptid_t (*wait) (ptid_t ptid, struct target_waitstatus *status, int options);
-
/* Fetch registers from the inferior process.
If REGNO is -1, fetch all registers; otherwise, fetch at least REGNO. */
@@ -481,6 +468,19 @@ public:
/* Resume the inferior process. */
virtual void resume (thread_resume *resume_info, size_t n) = 0;
+
+ /* Wait for the inferior process or thread to change state. Store
+ status through argument pointer STATUS.
+
+ PTID = -1 to wait for any pid to do something, PTID(pid,0,0) to
+ wait for any thread of process pid to do something. Return ptid
+ of child, or -1 in case of error; store status through argument
+ pointer STATUS. OPTIONS is a bit set of options defined as
+ TARGET_W* above. If options contains TARGET_WNOHANG and there's
+ no child stop to report, return is
+ null_ptid/TARGET_WAITKIND_IGNORE. */
+ virtual ptid_t wait (ptid_t ptid, target_waitstatus *status,
+ int options) = 0;
};
extern process_stratum_target *the_target;
diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c
index fcbf3075e80..b2723b6d292 100644
--- a/gdbserver/win32-low.c
+++ b/gdbserver/win32-low.c
@@ -103,8 +103,6 @@ typedef BOOL (WINAPI *winapi_DebugSetProcessKillOnExit) (BOOL KillOnExit);
typedef BOOL (WINAPI *winapi_DebugBreakProcess) (HANDLE);
typedef BOOL (WINAPI *winapi_GenerateConsoleCtrlEvent) (DWORD, DWORD);
-static ptid_t win32_wait (ptid_t ptid, struct target_waitstatus *ourstatus,
- int options);
static void win32_resume (struct thread_resume *resume_info, size_t n);
#ifndef _WIN32_WCE
static void win32_add_all_dlls (void);
@@ -380,7 +378,7 @@ do_initial_child_stuff (HANDLE proch, DWORD pid, int attached)
{
struct target_waitstatus status;
- win32_wait (minus_one_ptid, &status, 0);
+ the_target->pt->wait (minus_one_ptid, &status, 0);
/* Note win32_wait doesn't return thread events. */
if (status.kind != TARGET_WAITKIND_LOADED)
@@ -707,7 +705,7 @@ win32_process_target::create_inferior (
/* Wait till we are at 1st instruction in program, return new pid
(assuming success). */
- cs.last_ptid = win32_wait (ptid_t (current_process_id), &cs.last_status, 0);
+ cs.last_ptid = wait (ptid_t (current_process_id), &cs.last_status, 0);
return current_process_id;
}
@@ -1600,8 +1598,9 @@ get_child_debug_event (struct target_waitstatus *ourstatus)
/* Wait for the inferior process to change state.
STATUS will be filled in with a response code to send to GDB.
Returns the signal which caused the process to stop. */
-static ptid_t
-win32_wait (ptid_t ptid, struct target_waitstatus *ourstatus, int options)
+ptid_t
+win32_process_target::wait (ptid_t ptid, target_waitstatus *ourstatus,
+ int options)
{
struct regcache *regcache;
@@ -1828,7 +1827,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_wait,
win32_fetch_inferior_registers,
win32_store_inferior_registers,
NULL, /* prepare_to_access_memory */
diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h
index 472be13d518..aa509f64ca8 100644
--- a/gdbserver/win32-low.h
+++ b/gdbserver/win32-low.h
@@ -122,6 +122,9 @@ public:
bool thread_alive (ptid_t pid) override;
void resume (thread_resume *resume_info, size_t n) override;
+
+ ptid_t wait (ptid_t ptid, target_waitstatus *status,
+ int options) override;
};
/* Retrieve the context for this thread, if not already retrieved. */
--
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 18/58] gdbserver: turn target op 'supports_z_point_type' 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 ` Tankut Baris Aktemur [this message]
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 05/58] gdbserver: turn target op 'kill' into a method Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 27/58] gdbserver: turn target op 'qxfer_osdata' " 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 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 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 08/58] gdbserver: turn target op 'join' " 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 25/58] gdbserver: turn target op 'get_tls_address' into a method 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 03/58] gdbserver: turn target op 'post_create_inferior' into a method 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 37/58] gdbserver: turn target op 'supports_tracepoints' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 09/58] gdbserver: turn target op 'thread_alive' " 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 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 04/58] gdbserver: turn target op 'attach' " 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: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 53/58] gdbserver: turn target ops 'thread_name' and 'thread_handle' " 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 42/58] gdbserver: turn target op 'stabilize_threads' " 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 39/58] gdbserver: turn target op 'thread_stopped' " 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 14/58] gdbserver: turn target ops 'read_memory' and 'write_memory' into methods Tankut Baris Aktemur
2020-02-11 9:04 ` [PATCH 47/58] gdbserver: turn target op 'supports_agent' into a method 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:05 ` [PATCH 16/58] gdbserver: turn target op 'request_interrupt' " 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 41/58] gdbserver: turn target ops 'pause_all' and 'unpause_all' " 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 ` [PATCH 30/58] gdbserver: turn target op 'supports_multi_process' " Tankut Baris Aktemur
2020-02-11 9:05 ` [PATCH 29/58] gdbserver: turn non-stop and async target ops into methods Tankut Baris Aktemur
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 44/58] gdbserver: turn target op 'emit_ops' into a method 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=78de6d2be971d05f6f637b260555440ade8cee95.1581410933.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).