Merge GDB 7.5.1

gdb/ser-base.c

 /* Generic serial interface functions.
 
    Copyright (C) 1992-1996, 1998-2001, 2003-2012 Free Software
    Foundation, Inc.
 
    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 105 matching lines @@
               if (scb->async_state == FD_SCHEDULED)
                 fprintf_unfiltered (gdb_stdlog, "[fd%d->timer-scheduled]\n",
                                     scb->fd);
               break;
             }
         }
       scb->async_state = next_state;
     }
 }
 
+/* Run the SCB's async handle, and reschedule, if the handler doesn't
+   close SCB.  */
+
+static void
+run_async_handler_and_reschedule (struct serial *scb)
+{
+  int is_open;
+
+  /* Take a reference, so a serial_close call within the handler
+     doesn't make SCB a dangling pointer.  */
+  serial_ref (scb);
+
+  /* Run the handler.  */
+  scb->async_handler (scb, scb->async_context);
+
+  is_open = serial_is_open (scb);
+  serial_unref (scb);
+
+  /* Get ready for more, if not already closed.  */
+  if (is_open)
+    reschedule (scb);
+}
+
 /* FD_EVENT: This is scheduled when the input FIFO is empty (and there
    is no pending error).  As soon as data arrives, it is read into the
    input FIFO and the client notified.  The client should then drain
    the FIFO using readchar().  If the FIFO isn't immediatly emptied,
    push_event() is used to nag the client until it is.  */
 
 static void
 fd_event (int error, void *context)
 {
   struct serial *scb = context;
@@ skipping 15 matching lines @@
       else if (nr > 0)
         {
           scb->bufcnt = nr;
           scb->bufp = scb->buf;
         }
       else
         {
           scb->bufcnt = SERIAL_ERROR;
         }
     }
-  scb->async_handler (scb, scb->async_context);
-  reschedule (scb);
+  run_async_handler_and_reschedule (scb);
 }
 
 /* PUSH_EVENT: The input FIFO is non-empty (or there is a pending
    error).  Nag the client until all the data has been read.  In the
    case of errors, the client will need to close or de-async the
    device before naging stops.  */
 
 static void
 push_event (void *context)
 {
   struct serial *scb = context;
 
   scb->async_state = NOTHING_SCHEDULED; /* Timers are one-off */
-  scb->async_handler (scb, scb->async_context);
-  /* re-schedule */
-  reschedule (scb);
+  run_async_handler_and_reschedule (scb);
 }
 
 /* Wait for input on scb, with timeout seconds.  Returns 0 on success,
    otherwise SERIAL_TIMEOUT or SERIAL_ERROR.  */
 
 static int
 ser_base_wait_for (struct serial *scb, int timeout)
 {
   while (1)
     {
@@ skipping 342 matching lines @@
           delete_file_handler (scb->fd);
           break;
         case NOTHING_SCHEDULED:
           break;
         default: /* TIMER SCHEDULED */
           delete_timer (scb->async_state);
           break;
         }
     }
 }