From c9b7b80460e47ea4554960af6814de71b3e427cb Mon Sep 17 00:00:00 2001 From: Tankut Baris Aktemur Date: Mon, 17 Feb 2020 16:12:02 +0100 Subject: [PATCH] gdbserver: turn target ops 'multifs_{open, readlink, unlink}' into methods gdbserver/ChangeLog: 2020-02-20 Tankut Baris Aktemur Turn process_stratum_target's multifs_open, multifs_readlink, multifs_unlink ops into 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.cc: 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 classes and callers below. * hostio.cc (handle_setfs): Update. (handle_open): Update. (handle_unlink): Update. (handle_readlink): Update. * linux-low.cc (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.cc (lynx_target_ops): Update. * nto-low.cc (nto_target_ops): Update. * win32-low.cc (win32_target_ops): Update. --- gdbserver/ChangeLog | 31 +++++++++++++++++++++++++++++ gdbserver/hostio.cc | 22 ++++++++++----------- gdbserver/linux-low.cc | 29 +++++++++++++++++++++++++--- gdbserver/linux-low.h | 10 ++++++++++ gdbserver/lynx-low.cc | 3 --- gdbserver/nto-low.cc | 3 --- gdbserver/target.cc | 30 ++++++++++++++++++++++++++++ gdbserver/target.h | 44 ++++++++++++++++++++++-------------------- gdbserver/win32-low.cc | 3 --- 9 files changed, 130 insertions(+), 45 deletions(-) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index fcf487142f5..dee5728f0aa 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,34 @@ +2020-02-20 Tankut Baris Aktemur + + Turn process_stratum_target's multifs_open, multifs_readlink, + multifs_unlink ops into 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.cc: 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 classes and callers below. + + * hostio.cc (handle_setfs): Update. + (handle_open): Update. + (handle_unlink): Update. + (handle_readlink): Update. + * linux-low.cc (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.cc (lynx_target_ops): Update. + * nto-low.cc (nto_target_ops): Update. + * win32-low.cc (win32_target_ops): Update. + 2020-02-20 Tankut Baris Aktemur Turn process_stratum_target's pid_to_exec_file op into a method diff --git a/gdbserver/hostio.cc b/gdbserver/hostio.cc index a3b32cd0fdc..6223b24a887 100644 --- a/gdbserver/hostio.cc +++ b/gdbserver/hostio.cc @@ -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.cc b/gdbserver/linux-low.cc index 118aee9a15d..c49ba892468 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6453,6 +6453,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 { @@ -7483,9 +7509,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 af5892e767a..9fd2bc0ea35 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -452,6 +452,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.cc b/gdbserver/lynx-low.cc index 5e23713cfaf..ad669c8e9d7 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -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.cc b/gdbserver/nto-low.cc index 9a798bf6ec1..1140b5b6d49 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -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.cc b/gdbserver/target.cc index 3787e94ad55..4c92fa6f89d 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -22,6 +22,10 @@ #include "tracepoint.h" #include "gdbsupport/byte-vector.h" #include "hostio.h" +#include +#include +#include +#include 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 d728646d274..bf653a4d08a 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.cc b/gdbserver/win32-low.cc index 3b1f7d33f40..eb51a857b25 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1858,9 +1858,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.39.2