[PATCH 3/3] [gdbsupport] Add gdb::wait

[Tom de Vries <tdevries@suse.de>]

Add gdb::wait, and use it in gdb/procfs.c, making sure that EINTR is handled.

Tested on x86_64-linux.
---
 gdb/procfs.c        | 9 +++++----
 gdbsupport/eintr.cc | 6 ++++++
 gdbsupport/eintr.h  | 2 ++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/gdb/procfs.c b/gdb/procfs.c
index 22e012f0f31..d5177f3735d 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -2062,8 +2062,9 @@ procfs_target::wait (ptid_t ptid, struct target_waitstatus *status,
 	    {
 	      int wait_retval;
 
-	      /* /proc file not found; presumably child has terminated.  */
-	      wait_retval = ::wait (&wstat); /* "wait" for the child's exit.  */
+	      /* /proc file not found; presumably child has terminated.  Wait
+		 for the child's exit.  */
+	      wait_retval = gdb::wait (&wstat);
 
 	      /* Wrong child?  */
 	      if (wait_retval != inf->pid)
@@ -2150,7 +2151,7 @@ procfs_target::wait (ptid_t ptid, struct target_waitstatus *status,
 		      }
 		    else
 		      {
-			int temp = ::wait (&wstat);
+			int temp = gdb::wait (&wstat);
 
 			/* FIXME: shouldn't I make sure I get the right
 			   event from the right process?  If (for
@@ -2562,7 +2563,7 @@ unconditionally_kill_inferior (procinfo *pi)
 
       ret = gdb::waitpid (pi->pid, &status, 0);
 #else
-      wait (NULL);
+      gdb::wait (NULL);
 #endif
     }
 }
diff --git a/gdbsupport/eintr.cc b/gdbsupport/eintr.cc
index 7e24fa56224..cb6e45feb3c 100644
--- a/gdbsupport/eintr.cc
+++ b/gdbsupport/eintr.cc
@@ -33,6 +33,12 @@ extern "C" {
     return gdb::handle_eintr (-1, ::waitpid, pid, wstatus, options);
   }
 
+  pid_t
+  wait (int *wstatus)
+  {
+    return gdb::handle_eintr (-1, ::wait, wstatus);
+  }
+
   int
   open (const char *pathname, int flags)
   {
diff --git a/gdbsupport/eintr.h b/gdbsupport/eintr.h
index 3919c9fd930..286da5fc400 100644
--- a/gdbsupport/eintr.h
+++ b/gdbsupport/eintr.h
@@ -68,6 +68,8 @@ handle_eintr (ErrorValType errval, const Fun &f, const Args &... args)
 
 extern "C" {
   extern pid_t waitpid (pid_t pid, int *wstatus, int options);
+  extern pid_t wait (int *wstatus);
+
   extern int open (const char *pathname, int flags);
   extern int close (int fd);
   extern ssize_t read (int fd, void *buf, size_t count);
-- 
2.35.3