Merge GDB 7.5.1

gdb/ser-pipe.c

 /* Serial interface for a pipe to a separate program
    Copyright (C) 1999-2001, 2007-2012 Free Software Foundation, Inc.
 
    Contributed by Cygnus Solutions.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
@@ skipping 12 matching lines @@
 #include "ser-base.h"
 #include "ser-unix.h"
 
 #include "gdb_vfork.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <fcntl.h>
 #include "gdb_string.h"
-#include "gdb_wait.h"
 
 #include <signal.h>
 
 static int pipe_open (struct serial *scb, const char *name);
 static void pipe_close (struct serial *scb);
 
 extern void _initialize_ser_pipe (void);
 
 struct pipe_state
   {
@@ skipping 111 matching lines @@
 static void
 pipe_close (struct serial *scb)
 {
   struct pipe_state *state = scb->state;
 
   close (scb->fd);
   scb->fd = -1;
 
   if (state != NULL)
     {
-      int status;
-      kill (state->pid, SIGTERM);
-#ifdef HAVE_WAITPID
+      int wait_result, status;
+
+      /* Don't kill the task right away, give it a chance to shut down cleanly.
+         But don't wait forever though.  */
+#define PIPE_CLOSE_TIMEOUT 5
+
       /* Assume the program will exit after SIGTERM.  Might be
          useful to print any remaining stderr output from
          scb->error_fd while waiting.  */
-      waitpid (state->pid, &status, 0);
+#define SIGTERM_TIMEOUT INT_MAX
+
+      wait_result = -1;
+#ifdef HAVE_WAITPID
+      wait_result = wait_to_die_with_timeout (state->pid, &status,
+                                              PIPE_CLOSE_TIMEOUT);
 #endif
+      if (wait_result == -1)
+        {
+          kill (state->pid, SIGTERM);
+#ifdef HAVE_WAITPID
+          wait_to_die_with_timeout (state->pid, &status, SIGTERM_TIMEOUT);
+#endif
+        }
+
       if (scb->error_fd != -1)
         close (scb->error_fd);
       scb->error_fd = -1;
       xfree (state);
       scb->state = NULL;
     }
 }
 
 int
 gdb_pipe (int pdes[2])
@@ skipping 35 matching lines @@
   ops->print_tty_state = ser_base_print_tty_state;
   ops->noflush_set_tty_state = ser_base_noflush_set_tty_state;
   ops->setbaudrate = ser_base_setbaudrate;
   ops->setstopbits = ser_base_setstopbits;
   ops->drain_output = ser_base_drain_output;
   ops->async = ser_base_async;
   ops->read_prim = ser_unix_read_prim;
   ops->write_prim = ser_unix_write_prim;
   serial_add_interface (ops);
 }