+2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
+
+ 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 <tankut.baris.aktemur@intel.com>
Turn process_stratum_target's pid_to_exec_file op into a method
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;
/* 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);
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);
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);
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
{
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,
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)))
/* 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 */
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 */
#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;
{
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);
+}
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. */
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;
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 */
projects / binutils-gdb.git / commitdiff