From: Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 51/58] gdbserver: turn target ops 'multifs_{open, readlink, unlink}' into methods
Date: Tue, 11 Feb 2020 09:05:00 -0000 [thread overview]
Message-ID: <190a0b50b626e38e37087a0dea99ab8419ff8522.1581410935.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 multifs_open, multifs_readlink,
multifs_unlink ops methods of process_target.
* target.h (struct process_stratum_target): Remove the target ops.
(class process_target): Add the target ops. Also add
'supports_multifs'.
* target.c: Include "fcntl.h", "unistd.h", "sys/types.h", and
"sys/stat.h".
(process_target::supports_multifs): Define.
(process_target::multifs_open): Define.
(process_target::multifs_readlink): Define.
(process_target::multifs_unlink): Define.
Update the derived structs and callers below.
* hostio.c (handle_setfs): Update.
(handle_open): Update.
(handle_unlink): Update.
(handle_readlink): Update.
* linux-low.c (linux_target_ops): Update.
(linux_process_target::supports_multifs): Define.
(linux_process_target::multifs_open): Define.
(linux_process_target::multifs_readlink): Define.
(linux_process_target::multifs_unlink): Define.
* linux-low.h (class linux_process_target): Update.
* lynx-low.c (lynx_target_ops): Update.
* nto-low.c (nto_target_ops): Update.
* win32-low.c (win32_target_ops): Update.
---
gdbserver/hostio.c | 22 ++++++++++------------
gdbserver/linux-low.c | 29 +++++++++++++++++++++++++---
gdbserver/linux-low.h | 10 ++++++++++
gdbserver/lynx-low.c | 3 ---
gdbserver/nto-low.c | 3 ---
gdbserver/target.c | 30 +++++++++++++++++++++++++++++
gdbserver/target.h | 44 ++++++++++++++++++++++---------------------
gdbserver/win32-low.c | 3 ---
8 files changed, 99 insertions(+), 45 deletions(-)
diff --git a/gdbserver/hostio.c b/gdbserver/hostio.c
index a3b32cd0fdc..6223b24a887 100644
--- a/gdbserver/hostio.c
+++ b/gdbserver/hostio.c
@@ -272,9 +272,7 @@ handle_setfs (char *own_buf)
then there's no point in GDB sending "vFile:setfs:" packets. We
reply with an empty packet (i.e. we pretend we don't understand
"vFile:setfs:") and that should stop GDB sending any more. */
- if (the_target->multifs_open == NULL
- && the_target->multifs_unlink == NULL
- && the_target->multifs_readlink == NULL)
+ if (!the_target->pt->supports_multifs ())
{
own_buf[0] = '\0';
return;
@@ -321,9 +319,9 @@ handle_open (char *own_buf)
/* We do not need to convert MODE, since the fileio protocol
uses the standard values. */
- if (hostio_fs_pid != 0 && the_target->multifs_open != NULL)
- fd = the_target->multifs_open (hostio_fs_pid, filename,
- flags, mode);
+ if (hostio_fs_pid != 0)
+ fd = the_target->pt->multifs_open (hostio_fs_pid, filename,
+ flags, mode);
else
fd = open (filename, flags, mode);
@@ -541,8 +539,8 @@ handle_unlink (char *own_buf)
return;
}
- if (hostio_fs_pid != 0 && the_target->multifs_unlink != NULL)
- ret = the_target->multifs_unlink (hostio_fs_pid, filename);
+ if (hostio_fs_pid != 0)
+ ret = the_target->pt->multifs_unlink (hostio_fs_pid, filename);
else
ret = unlink (filename);
@@ -571,10 +569,10 @@ handle_readlink (char *own_buf, int *new_packet_len)
return;
}
- if (hostio_fs_pid != 0 && the_target->multifs_readlink != NULL)
- ret = the_target->multifs_readlink (hostio_fs_pid, filename,
- linkname,
- sizeof (linkname) - 1);
+ if (hostio_fs_pid != 0)
+ ret = the_target->pt->multifs_readlink (hostio_fs_pid, filename,
+ linkname,
+ sizeof (linkname) - 1);
else
ret = readlink (filename, linkname, sizeof (linkname) - 1);
diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c
index 476ad1c5eaa..b19c3458bc5 100644
--- a/gdbserver/linux-low.c
+++ b/gdbserver/linux-low.c
@@ -6442,6 +6442,32 @@ linux_process_target::pid_to_exec_file (int pid)
return linux_proc_pid_to_exec_file (pid);
}
+bool
+linux_process_target::supports_multifs ()
+{
+ return true;
+}
+
+int
+linux_process_target::multifs_open (int pid, const char *filename,
+ int flags, mode_t mode)
+{
+ return linux_mntns_open_cloexec (pid, filename, flags, mode);
+}
+
+int
+linux_process_target::multifs_unlink (int pid, const char *filename)
+{
+ return linux_mntns_unlink (pid, filename);
+}
+
+ssize_t
+linux_process_target::multifs_readlink (int pid, const char *filename,
+ char *buf, size_t bufsiz)
+{
+ return linux_mntns_readlink (pid, filename, buf, bufsiz);
+}
+
#if defined PT_GETDSBT || defined PTRACE_GETFDPIC
struct target_loadseg
{
@@ -7472,9 +7498,6 @@ linux_get_hwcap2 (int wordsize)
static linux_process_target the_linux_target;
static process_stratum_target linux_target_ops = {
- linux_mntns_open_cloexec,
- linux_mntns_unlink,
- linux_mntns_readlink,
linux_breakpoint_kind_from_pc,
linux_sw_breakpoint_from_kind,
linux_proc_tid_get_name,
diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h
index cb11c199033..7ee9c0c03d0 100644
--- a/gdbserver/linux-low.h
+++ b/gdbserver/linux-low.h
@@ -455,6 +455,16 @@ public:
bool supports_pid_to_exec_file () override;
char *pid_to_exec_file (int pid) override;
+
+ bool supports_multifs () override;
+
+ int multifs_open (int pid, const char *filename, int flags,
+ mode_t mode) override;
+
+ int multifs_unlink (int pid, const char *filename) override;
+
+ ssize_t multifs_readlink (int pid, const char *filename, char *buf,
+ size_t bufsiz) 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 132087ce7ea..11a7ab9e6a6 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, /* multifs_open */
- NULL, /* multifs_unlink */
- NULL, /* multifs_readlink */
NULL, /* breakpoint_kind_from_pc */
NULL, /* sw_breakpoint_from_kind */
NULL, /* thread_name */
diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c
index 8927293d75d..f5919baa5cb 100644
--- a/gdbserver/nto-low.c
+++ b/gdbserver/nto-low.c
@@ -947,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 = {
- NULL, /* multifs_open */
- NULL, /* multifs_unlink */
- NULL, /* multifs_readlink */
NULL, /* breakpoint_kind_from_pc */
nto_sw_breakpoint_from_kind,
NULL, /* thread_name */
diff --git a/gdbserver/target.c b/gdbserver/target.c
index b1c318f59b8..39e763dffc8 100644
--- a/gdbserver/target.c
+++ b/gdbserver/target.c
@@ -22,6 +22,10 @@
#include "tracepoint.h"
#include "gdbsupport/byte-vector.h"
#include "hostio.h"
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
process_stratum_target *the_target;
@@ -771,3 +775,29 @@ process_target::pid_to_exec_file (int pid)
{
gdb_assert_not_reached ("target op pid_to_exec_file not supported");
}
+
+bool
+process_target::supports_multifs ()
+{
+ return false;
+}
+
+int
+process_target::multifs_open (int pid, const char *filename,
+ int flags, mode_t mode)
+{
+ return open (filename, flags, mode);
+}
+
+int
+process_target::multifs_unlink (int pid, const char *filename)
+{
+ return unlink (filename);
+}
+
+ssize_t
+process_target::multifs_readlink (int pid, const char *filename,
+ char *buf, size_t bufsiz)
+{
+ return readlink (filename, buf, bufsiz);
+}
diff --git a/gdbserver/target.h b/gdbserver/target.h
index 6de6c3cdaec..f7f0e6b779c 100644
--- a/gdbserver/target.h
+++ b/gdbserver/target.h
@@ -70,27 +70,6 @@ class process_target;
shared code. */
struct process_stratum_target
{
- /* Multiple-filesystem-aware open. Like open(2), but operating in
- the filesystem as it appears to process PID. Systems where all
- processes share a common filesystem should set this to NULL.
- If NULL, the caller should fall back to open(2). */
- int (*multifs_open) (int pid, const char *filename,
- int flags, mode_t mode);
-
- /* Multiple-filesystem-aware unlink. Like unlink(2), but operates
- in the filesystem as it appears to process PID. Systems where
- all processes share a common filesystem should set this to NULL.
- If NULL, the caller should fall back to unlink(2). */
- int (*multifs_unlink) (int pid, const char *filename);
-
- /* Multiple-filesystem-aware readlink. Like readlink(2), but
- operating in the filesystem as it appears to process PID.
- Systems where all processes share a common filesystem should
- set this to NULL. If NULL, the caller should fall back to
- readlink(2). */
- ssize_t (*multifs_readlink) (int pid, const char *filename,
- char *buf, size_t bufsiz);
-
/* Return the breakpoint kind for this target based on PC. The PCPTR is
adjusted to the real memory location in case a flag (e.g., the Thumb bit on
ARM) was present in the PC. */
@@ -501,6 +480,29 @@ public:
string should be copied into a buffer by the client if the string
will not be immediately used, or if it must persist. */
virtual char *pid_to_exec_file (int pid);
+
+ /* Return true if any of the multifs ops is supported. */
+ virtual bool supports_multifs ();
+
+ /* Multiple-filesystem-aware open. Like open(2), but operating in
+ the filesystem as it appears to process PID. Systems where all
+ processes share a common filesystem should not override this.
+ The default behavior is to use open(2). */
+ virtual int multifs_open (int pid, const char *filename,
+ int flags, mode_t mode);
+
+ /* Multiple-filesystem-aware unlink. Like unlink(2), but operates
+ in the filesystem as it appears to process PID. Systems where
+ all processes share a common filesystem should not override this.
+ The default behavior is to use unlink(2). */
+ virtual int multifs_unlink (int pid, const char *filename);
+
+ /* Multiple-filesystem-aware readlink. Like readlink(2), but
+ operating in the filesystem as it appears to process PID.
+ Systems where all processes share a common filesystem should
+ not override this. The default behavior is to use readlink(2). */
+ virtual ssize_t multifs_readlink (int pid, const char *filename,
+ char *buf, size_t bufsiz);
};
extern process_stratum_target *the_target;
diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c
index d5e15202ae1..ecece2d579c 100644
--- a/gdbserver/win32-low.c
+++ b/gdbserver/win32-low.c
@@ -1848,9 +1848,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, /* multifs_open */
- NULL, /* multifs_unlink */
- NULL, /* multifs_readlink */
NULL, /* breakpoint_kind_from_pc */
win32_sw_breakpoint_from_kind,
NULL, /* thread_name */
--
2.17.1
next prev parent reply other threads:[~2020-02-11 9:04 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 24/58] gdbserver: turn target op 'read_offsets' into a method 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 28/58] gdbserver: turn target op 'qxfer_siginfo' " 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 26/58] gdbserver: turn target op 'hostio_last_error' into a method 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: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 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 46/58] gdbserver: turn target op 'qxfer_libraries_svr4' " Tankut Baris Aktemur
2020-02-11 9:03 ` [PATCH 11/58] gdbserver: turn target op 'wait' " 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:04 ` [PATCH 34/58] gdbserver: turn target op 'core_of_thread' " 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 39/58] gdbserver: turn target op 'thread_stopped' into a method 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:04 ` [PATCH 17/58] gdbserver: turn target op 'read_auxv' into a method 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 56/58] gdbserver: turn target op 'get_ipa_tdesc_idx' " 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 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:05 ` [PATCH 29/58] gdbserver: turn non-stop and async target ops " 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 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 9:05 ` [PATCH 10/58] gdbserver: turn target op 'resume' " Tankut Baris Aktemur
2020-02-11 9:05 ` [PATCH 41/58] gdbserver: turn target ops 'pause_all' and 'unpause_all' into methods 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 ` Tankut Baris Aktemur [this message]
2020-02-11 9:05 ` [PATCH 35/58] gdbserver: turn target op 'read_loadmap' " 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=190a0b50b626e38e37087a0dea99ab8419ff8522.1581410935.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).