[PATCH v2 1/5] [gdbsupport] Add gdb_{waitpid,read,write,close}

[Tom de Vries]

We have gdb::handle_eintr, which allows us to rewrite:
...
  ssize_t ret;
    do
      {
        errno = 0;
        ret = ::write (pipe[1], "+", 1);
      }
    while (ret == -1 && errno == EINTR);
...
into:
...
  ssize_t ret = gdb::handle_eintr (-1, ::write, pipe[1], "+", 1);
...

However, the call to write got a bit mangled, requiring effort to decode it
back to its original form.

Instead, add a new function gdb_write that allows us to write:
...
  ssize_t ret = gdb_write (pipe[1], "+", 1);
...

Likewise for waitpid, read and close.

Tested on x86_64-linux.
---
 gdb/cli/cli-cmds.c      |  2 +-
 gdb/nat/linux-waitpid.c |  2 +-
 gdbserver/netbsd-low.cc | 10 +++++-----
 gdbsupport/eintr.h      | 31 +++++++++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 65ac7d6e7fb..a9d1cafd03e 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -923,7 +923,7 @@ run_under_shell (const char *arg, int from_tty)
 
   if (pid != -1)
     {
-      int ret = gdb::handle_eintr (-1, ::waitpid, pid, &status, 0);
+      int ret = gdb_waitpid (pid, &status, 0);
       if (ret == -1)
 	perror_with_name ("Cannot get status of shell command");
     }
diff --git a/gdb/nat/linux-waitpid.c b/gdb/nat/linux-waitpid.c
index 0ac2f9fb2b9..c9fab90838c 100644
--- a/gdb/nat/linux-waitpid.c
+++ b/gdb/nat/linux-waitpid.c
@@ -51,5 +51,5 @@ status_to_str (int status)
 int
 my_waitpid (int pid, int *status, int flags)
 {
-  return gdb::handle_eintr (-1, ::waitpid, pid, status, flags);
+  return gdb_waitpid (pid, status, flags);
 }
diff --git a/gdbserver/netbsd-low.cc b/gdbserver/netbsd-low.cc
index 4b58826e091..6b3bbafaa7e 100644
--- a/gdbserver/netbsd-low.cc
+++ b/gdbserver/netbsd-low.cc
@@ -222,7 +222,7 @@ netbsd_waitpid (ptid_t ptid, struct target_waitstatus *ourstatus,
   int options = (target_options & TARGET_WNOHANG) ? WNOHANG : 0;
 
   pid_t pid
-    = gdb::handle_eintr (-1, ::waitpid, ptid.pid (), &status, options);
+    = gdb_waitpid (ptid.pid (), &status, options);
 
   if (pid == -1)
     perror_with_name (_("Child process unexpectedly missing"));
@@ -432,7 +432,7 @@ netbsd_process_target::kill (process_info *process)
     return -1;
 
   int status;
-  if (gdb::handle_eintr (-1, ::waitpid, pid, &status, 0) == -1)
+  if (gdb_waitpid (pid, &status, 0) == -1)
     return -1;
   mourn (process);
   return 0;
@@ -1123,15 +1123,15 @@ netbsd_qxfer_libraries_svr4 (const pid_t pid, const char *annex,
 static bool
 elf_64_file_p (const char *file)
 {
-  int fd = gdb::handle_eintr (-1, ::open, file, O_RDONLY);
+  int fd = gdb_open (file, O_RDONLY);
   if (fd < 0)
     perror_with_name (("open"));
 
   Elf64_Ehdr header;
-  ssize_t ret = gdb::handle_eintr (-1, ::read, fd, &header, sizeof (header));
+ ssize_t ret = gdb_read (fd, &header, sizeof (header));
   if (ret == -1)
     perror_with_name (("read"));
-  gdb::handle_eintr (-1, ::close, fd);
+  gdb_close (fd);
   if (ret != sizeof (header))
     error ("Cannot read ELF file header: %s", file);
 
diff --git a/gdbsupport/eintr.h b/gdbsupport/eintr.h
index e440f935fcf..aec388e18fc 100644
--- a/gdbsupport/eintr.h
+++ b/gdbsupport/eintr.h
@@ -21,6 +21,11 @@
 #define GDBSUPPORT_EINTR_H
 
 #include <cerrno>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
 
 namespace gdb
 {
@@ -68,4 +73,30 @@ handle_eintr (ErrorValType errval, const Fun &f, const Args &... args)
 
 } /* namespace gdb */
 
+/* Syscall wrappers that care of EINTR.  */
+
+inline pid_t
+gdb_waitpid (pid_t pid, int *wstatus, int options)
+{
+  return gdb::handle_eintr (-1, ::waitpid, pid, wstatus, options);
+}
+
+inline int
+gdb_open (const char *pathname, int flags)
+{
+  return gdb::handle_eintr (-1, ::open, pathname, flags);
+}
+
+inline int
+gdb_close (int fd)
+{
+  return gdb::handle_eintr (-1, ::close, fd);
+}
+
+inline ssize_t
+gdb_read (int fd, void *buf, size_t count)
+{
+  return gdb::handle_eintr (-1, ::read, fd, buf, count);
+}
+
 #endif /* GDBSUPPORT_EINTR_H */

base-commit: e1e4078ac59740a79cd709d61872abe15aba0087
-- 
2.35.3