* symtab.c (find_pc_sect_line): Use SYMBOL_VALUE_ADDRESS instead

[deliverable/binutils-gdb.git] / gdb / ser-mingw.c

diff --git a/gdb/ser-mingw.c b/gdb/ser-mingw.c
index fcbef3ab2ba7097d8a9e0381689e1d442b07084d..27a2ce836f7aaaab46d34b168db159164425bb82 100644 (file)
--- a/gdb/ser-mingw.c
+++ b/gdb/ser-mingw.c
@@ -1,12 +1,12 @@
 /* Serial interface for local (hardwired) serial ports on Windows systems
 
 /* Serial interface for local (hardwired) serial ports on Windows systems
 

-   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007, 2008 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
 
    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 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -15,9 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "serial.h"
 
 #include "defs.h"
 #include "serial.h"


@@ -343,19 +341,162 @@ ser_windows_write_prim (struct serial *scb, const void *buf, size_t len)
   return bytes_written;
 }
 
   return bytes_written;
 }
 

+/* On Windows, gdb_select is implemented using WaitForMulpleObjects.
+   A "select thread" is created for each file descriptor.  These
+   threads looks for activity on the corresponding descriptor, using
+   whatever techniques are appropriate for the descriptor type.  When
+   that activity occurs, the thread signals an appropriate event,
+   which wakes up WaitForMultipleObjects.
+
+   Each select thread is in one of two states: stopped or started.
+   Select threads begin in the stopped state.  When gdb_select is
+   called, threads corresponding to the descriptors of interest are
+   started by calling a wait_handle function.  Each thread that
+   notices activity signals the appropriate event and then reenters
+   the stopped state.  Before gdb_select returns it calls the
+   wait_handle_done functions, which return the threads to the stopped
+   state.  */
+
+enum select_thread_state {
+  STS_STARTED,
+  STS_STOPPED
+};
+

 struct ser_console_state
 {
 struct ser_console_state
 {

+  /* Signaled by the select thread to indicate that data is available
+     on the file descriptor.  */

   HANDLE read_event;
   HANDLE read_event;

+  /* Signaled by the select thread to indicate that an exception has
+     occurred on the file descriptor.  */

   HANDLE except_event;
   HANDLE except_event;

+  /* Signaled by the select thread to indicate that it has entered the
+     started state.  HAVE_STARTED and HAVE_STOPPED are never signaled
+     simultaneously.  */
+  HANDLE have_started;
+  /* Signaled by the select thread to indicate that it has stopped,
+     either because data is available (and READ_EVENT is signaled),
+     because an exception has occurred (and EXCEPT_EVENT is signaled),
+     or because STOP_SELECT was signaled.  */
+  HANDLE have_stopped;

 
 

+  /* Signaled by the main program to tell the select thread to enter
+     the started state.  */

   HANDLE start_select;
   HANDLE start_select;

+  /* Signaled by the main program to tell the select thread to enter
+     the stopped state. */

   HANDLE stop_select;
   HANDLE stop_select;

+  /* Signaled by the main program to tell the select thread to
+     exit.  */

   HANDLE exit_select;
   HANDLE exit_select;

-  HANDLE have_stopped;

 
 

+  /* The handle for the select thread.  */

   HANDLE thread;
   HANDLE thread;

+  /* The state of the select thread.  This field is only accessed in
+     the main program, never by the select thread itself.  */
+  enum select_thread_state thread_state;

 };
 
 };
 

+/* Called by a select thread to enter the stopped state.  This
+   function does not return until the thread has re-entered the
+   started state.  */
+static void
+select_thread_wait (struct ser_console_state *state)
+{
+  HANDLE wait_events[2];
+
+  /* There are two things that can wake us up: a request that we enter
+     the started state, or that we exit this thread.  */
+  wait_events[0] = state->start_select;
+  wait_events[1] = state->exit_select;
+  if (WaitForMultipleObjects (2, wait_events, FALSE, INFINITE) 
+      != WAIT_OBJECT_0)
+    /* Either the EXIT_SELECT event was signaled (requesting that the
+       thread exit) or an error has occurred.  In either case, we exit
+       the thread.  */
+    ExitThread (0);
+  
+  /* We are now in the started state.  */
+  SetEvent (state->have_started);
+}
+
+typedef DWORD WINAPI (*thread_fn_type)(void *);
+
+/* Create a new select thread for SCB executing THREAD_FN.  The STATE
+   will be filled in by this function before return.  */
+void
+create_select_thread (thread_fn_type thread_fn,
+                     struct serial *scb,
+                     struct ser_console_state *state)
+{
+  DWORD threadId;
+
+  /* Create all of the events.  These are all auto-reset events.  */
+  state->read_event = CreateEvent (NULL, FALSE, FALSE, NULL);
+  state->except_event = CreateEvent (NULL, FALSE, FALSE, NULL);
+  state->have_started = CreateEvent (NULL, FALSE, FALSE, NULL);
+  state->have_stopped = CreateEvent (NULL, FALSE, FALSE, NULL);
+  state->start_select = CreateEvent (NULL, FALSE, FALSE, NULL);
+  state->stop_select = CreateEvent (NULL, FALSE, FALSE, NULL);
+  state->exit_select = CreateEvent (NULL, FALSE, FALSE, NULL);
+
+  state->thread = CreateThread (NULL, 0, thread_fn, scb, 0, &threadId);
+  /* The thread begins in the stopped state.  */
+  state->thread_state = STS_STOPPED;
+}
+
+/* Destroy the select thread indicated by STATE.  */
+static void
+destroy_select_thread (struct ser_console_state *state)
+{
+  /* Ask the thread to exit.  */
+  SetEvent (state->exit_select);
+  /* Wait until it does.  */
+  WaitForSingleObject (state->thread, INFINITE);
+
+  /* Destroy the events.  */
+  CloseHandle (state->read_event);
+  CloseHandle (state->except_event);
+  CloseHandle (state->have_started);
+  CloseHandle (state->have_stopped);
+  CloseHandle (state->start_select);
+  CloseHandle (state->stop_select);
+  CloseHandle (state->exit_select);
+}
+
+/* Called by gdb_select to start the select thread indicated by STATE.
+   This function does not return until the thread has started.  */
+static void
+start_select_thread (struct ser_console_state *state)
+{
+  /* Ask the thread to start.  */
+  SetEvent (state->start_select);
+  /* Wait until it does.  */
+  WaitForSingleObject (state->have_started, INFINITE);
+  /* The thread is now started.  */
+  state->thread_state = STS_STARTED;
+}
+
+/* Called by gdb_select to stop the select thread indicated by STATE.
+   This function does not return until the thread has stopped.  */
+static void
+stop_select_thread (struct ser_console_state *state)
+{
+  /* If the thread is already in the stopped state, we have nothing to
+     do.  Some of the wait_handle functions avoid calling
+     start_select_thread if they notice activity on the relevant file
+     descriptors.  The wait_handle_done functions still call
+     stop_select_thread -- but it is already stopped.  */
+  if (state->thread_state != STS_STARTED)
+    return;
+  /* Ask the thread to stop.  */
+  SetEvent (state->stop_select);
+  /* Wait until it does.  */
+  WaitForSingleObject (state->have_stopped, INFINITE);
+  /* The thread is now stopped.  */
+  state->thread_state = STS_STOPPED;
+}
+

 static DWORD WINAPI
 console_select_thread (void *arg)
 {
 static DWORD WINAPI
 console_select_thread (void *arg)
 {


@@ -373,74 +514,69 @@ console_select_thread (void *arg)
       INPUT_RECORD record;
       DWORD n_records;
 
       INPUT_RECORD record;
       DWORD n_records;
 

-      SetEvent (state->have_stopped);
-
-      wait_events[0] = state->start_select;
-      wait_events[1] = state->exit_select;
-
-      if (WaitForMultipleObjects (2, wait_events, FALSE, INFINITE) != WAIT_OBJECT_0)
-       return 0;
-
-      ResetEvent (state->have_stopped);
+      select_thread_wait (state);

 
 

-    retry:
-      wait_events[0] = state->stop_select;
-      wait_events[1] = h;
+      while (1)
+       {
+         wait_events[0] = state->stop_select;
+         wait_events[1] = h;

 
 

-      event_index = WaitForMultipleObjects (2, wait_events, FALSE, INFINITE);
+         event_index = WaitForMultipleObjects (2, wait_events, FALSE, INFINITE);

 
 

-      if (event_index == WAIT_OBJECT_0
-         || WaitForSingleObject (state->stop_select, 0) == WAIT_OBJECT_0)
-       continue;
+         if (event_index == WAIT_OBJECT_0
+             || WaitForSingleObject (state->stop_select, 0) == WAIT_OBJECT_0)
+           break;

 
 

-      if (event_index != WAIT_OBJECT_0 + 1)
-       {
-         /* Wait must have failed; assume an error has occured, e.g.
-            the handle has been closed.  */
-         SetEvent (state->except_event);
-         continue;
-       }
+         if (event_index != WAIT_OBJECT_0 + 1)
+           {
+             /* Wait must have failed; assume an error has occured, e.g.
+                the handle has been closed.  */
+             SetEvent (state->except_event);
+             break;
+           }

 
 

-      /* We've got a pending event on the console.  See if it's
-        of interest.  */
-      if (!PeekConsoleInput (h, &record, 1, &n_records) || n_records != 1)
-       {
-         /* Something went wrong.  Maybe the console is gone.  */
-         SetEvent (state->except_event);
-         continue;
-       }
+         /* We've got a pending event on the console.  See if it's
+            of interest.  */
+         if (!PeekConsoleInput (h, &record, 1, &n_records) || n_records != 1)
+           {
+             /* Something went wrong.  Maybe the console is gone.  */
+             SetEvent (state->except_event);
+             break;
+           }

 
 

-      if (record.EventType == KEY_EVENT && record.Event.KeyEvent.bKeyDown)
-       {
-         WORD keycode = record.Event.KeyEvent.wVirtualKeyCode;
-
-         /* Ignore events containing only control keys.  We must
-            recognize "enhanced" keys which we are interested in
-            reading via getch, if they do not map to ASCII.  But we
-            do not want to report input available for e.g. the
-            control key alone.  */
-
-         if (record.Event.KeyEvent.uChar.AsciiChar != 0
-             || keycode == VK_PRIOR
-             || keycode == VK_NEXT
-             || keycode == VK_END
-             || keycode == VK_HOME
-             || keycode == VK_LEFT
-             || keycode == VK_UP
-             || keycode == VK_RIGHT
-             || keycode == VK_DOWN
-             || keycode == VK_INSERT
-             || keycode == VK_DELETE)
+         if (record.EventType == KEY_EVENT && record.Event.KeyEvent.bKeyDown)

            {
            {

-             /* This is really a keypress.  */
-             SetEvent (state->read_event);
-             continue;
+             WORD keycode = record.Event.KeyEvent.wVirtualKeyCode;
+
+             /* Ignore events containing only control keys.  We must
+                recognize "enhanced" keys which we are interested in
+                reading via getch, if they do not map to ASCII.  But we
+                do not want to report input available for e.g. the
+                control key alone.  */
+
+             if (record.Event.KeyEvent.uChar.AsciiChar != 0
+                 || keycode == VK_PRIOR
+                 || keycode == VK_NEXT
+                 || keycode == VK_END
+                 || keycode == VK_HOME
+                 || keycode == VK_LEFT
+                 || keycode == VK_UP
+                 || keycode == VK_RIGHT
+                 || keycode == VK_DOWN
+                 || keycode == VK_INSERT
+                 || keycode == VK_DELETE)
+               {
+                 /* This is really a keypress.  */
+                 SetEvent (state->read_event);
+                 break;
+               }

            }
            }

+
+         /* Otherwise discard it and wait again.  */
+         ReadConsoleInput (h, &record, 1, &n_records);

        }
 
        }
 

-      /* Otherwise discard it and wait again.  */
-      ReadConsoleInput (h, &record, 1, &n_records);
-      goto retry;
+      SetEvent(state->have_stopped);

     }
 }
 
     }
 }
 


@@ -453,6 +589,15 @@ fd_is_pipe (int fd)
     return 0;
 }
 
     return 0;
 }
 

+static int
+fd_is_file (int fd)
+{
+  if (GetFileType ((HANDLE) _get_osfhandle (fd)) == FILE_TYPE_DISK)
+    return 1;
+  else
+    return 0;
+}
+

 static DWORD WINAPI
 pipe_select_thread (void *arg)
 {
 static DWORD WINAPI
 pipe_select_thread (void *arg)
 {


@@ -466,38 +611,56 @@ pipe_select_thread (void *arg)
 
   while (1)
     {
 
   while (1)
     {

-      HANDLE wait_events[2];

       DWORD n_avail;
 
       DWORD n_avail;
 

-      SetEvent (state->have_stopped);
-
-      wait_events[0] = state->start_select;
-      wait_events[1] = state->exit_select;
+      select_thread_wait (state);

 
 

-      if (WaitForMultipleObjects (2, wait_events, FALSE, INFINITE) != WAIT_OBJECT_0)
-       return 0;
+      /* Wait for something to happen on the pipe.  */
+      while (1)
+       {
+         if (!PeekNamedPipe (h, NULL, 0, NULL, &n_avail, NULL))
+           {
+             SetEvent (state->except_event);
+             break;
+           }

 
 

-      ResetEvent (state->have_stopped);
+         if (n_avail > 0)
+           {
+             SetEvent (state->read_event);
+             break;
+           }

 
 

-    retry:
-      if (!PeekNamedPipe (h, NULL, 0, NULL, &n_avail, NULL))
-       {
-         SetEvent (state->except_event);
-         continue;
+         /* Delay 10ms before checking again, but allow the stop
+            event to wake us.  */
+         if (WaitForSingleObject (state->stop_select, 10) == WAIT_OBJECT_0)
+           break;

        }
 
        }
 

-      if (n_avail > 0)
-       {
-         SetEvent (state->read_event);
-         continue;
-       }
+      SetEvent (state->have_stopped);
+    }
+}

 
 

-      /* Delay 10ms before checking again, but allow the stop event
-        to wake us.  */
-      if (WaitForSingleObject (state->stop_select, 10) == WAIT_OBJECT_0)
-       continue;
+static DWORD WINAPI
+file_select_thread (void *arg)
+{
+  struct serial *scb = arg;
+  struct ser_console_state *state;
+  int event_index;
+  HANDLE h;

 
 

-      goto retry;
+  state = scb->state;
+  h = (HANDLE) _get_osfhandle (scb->fd);
+
+  while (1)
+    {
+      select_thread_wait (state);
+
+      if (SetFilePointer (h, 0, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER)
+       SetEvent (state->except_event);
+      else
+       SetEvent (state->read_event);
+
+      SetEvent (state->have_stopped);

     }
 }
 
     }
 }
 


@@ -508,11 +671,11 @@ ser_console_wait_handle (struct serial *scb, HANDLE *read, HANDLE *except)
 
   if (state == NULL)
     {
 
   if (state == NULL)
     {

-      DWORD threadId;
+      thread_fn_type thread_fn;

       int is_tty;
 
       is_tty = isatty (scb->fd);
       int is_tty;
 
       is_tty = isatty (scb->fd);

-      if (!is_tty && !fd_is_pipe (scb->fd))
+      if (!is_tty && !fd_is_file (scb->fd) && !fd_is_pipe (scb->fd))

        {
          *read = NULL;
          *except = NULL;
        {
          *read = NULL;
          *except = NULL;


@@ -523,27 +686,14 @@ ser_console_wait_handle (struct serial *scb, HANDLE *read, HANDLE *except)
       memset (state, 0, sizeof (struct ser_console_state));
       scb->state = state;
 
       memset (state, 0, sizeof (struct ser_console_state));
       scb->state = state;
 

-      /* Create auto reset events to wake, stop, and exit the select
-        thread.  */
-      state->start_select = CreateEvent (0, FALSE, FALSE, 0);
-      state->stop_select = CreateEvent (0, FALSE, FALSE, 0);
-      state->exit_select = CreateEvent (0, FALSE, FALSE, 0);
-
-      /* Create a manual reset event to signal whether the thread is
-        stopped.  This must be manual reset, because we may wait on
-        it multiple times without ever starting the thread.  */
-      state->have_stopped = CreateEvent (0, TRUE, FALSE, 0);
-
-      /* Create our own events to report read and exceptions separately.  */
-      state->read_event = CreateEvent (0, FALSE, FALSE, 0);
-      state->except_event = CreateEvent (0, FALSE, FALSE, 0);
-

       if (is_tty)
       if (is_tty)

-       state->thread = CreateThread (NULL, 0, console_select_thread, scb, 0,
-                                     &threadId);
+       thread_fn = console_select_thread;
+      else if (fd_is_pipe (scb->fd))
+       thread_fn = pipe_select_thread;

       else
       else

-       state->thread = CreateThread (NULL, 0, pipe_select_thread, scb, 0,
-                                     &threadId);
+       thread_fn = file_select_thread;
+
+      create_select_thread (thread_fn, scb, state);

     }
 
   *read = state->read_event;
     }
 
   *read = state->read_event;


@@ -566,7 +716,7 @@ ser_console_wait_handle (struct serial *scb, HANDLE *read, HANDLE *except)
     }
 
   /* Otherwise, start the select thread.  */
     }
 
   /* Otherwise, start the select thread.  */

-  SetEvent (state->start_select);
+  start_select_thread (state);

 }
 
 static void
 }
 
 static void


@@ -577,8 +727,7 @@ ser_console_done_wait_handle (struct serial *scb)
   if (state == NULL)
     return;
 
   if (state == NULL)
     return;
 

-  SetEvent (state->stop_select);
-  WaitForSingleObject (state->have_stopped, INFINITE);
+  stop_select_thread (state);

 }
 
 static void
 }
 
 static void


@@ -588,18 +737,7 @@ ser_console_close (struct serial *scb)
 
   if (scb->state)
     {
 
   if (scb->state)
     {

-      SetEvent (state->exit_select);
-
-      WaitForSingleObject (state->thread, INFINITE);
-
-      CloseHandle (state->start_select);
-      CloseHandle (state->stop_select);
-      CloseHandle (state->exit_select);
-      CloseHandle (state->have_stopped);
-
-      CloseHandle (state->read_event);
-      CloseHandle (state->except_event);
-
+      destroy_select_thread (state);

       xfree (scb->state);
     }
 }
       xfree (scb->state);
     }
 }


@@ -657,19 +795,7 @@ free_pipe_state (struct pipe_state *ps)
   int saved_errno = errno;
 
   if (ps->wait.read_event != INVALID_HANDLE_VALUE)
   int saved_errno = errno;
 
   if (ps->wait.read_event != INVALID_HANDLE_VALUE)

-    {
-      SetEvent (ps->wait.exit_select);
-
-      WaitForSingleObject (ps->wait.thread, INFINITE);
-
-      CloseHandle (ps->wait.start_select);
-      CloseHandle (ps->wait.stop_select);
-      CloseHandle (ps->wait.exit_select);
-      CloseHandle (ps->wait.have_stopped);
-
-      CloseHandle (ps->wait.read_event);
-      CloseHandle (ps->wait.except_event);
-    }
+    destroy_select_thread (&ps->wait);

 
   /* Close the pipe to the child.  We must close the pipe before
      calling pex_free because pex_free will wait for the child to exit
 
   /* Close the pipe to the child.  We must close the pipe before
      calling pex_free because pex_free will wait for the child to exit


@@ -697,6 +823,7 @@ static int
 pipe_windows_open (struct serial *scb, const char *name)
 {
   struct pipe_state *ps;
 pipe_windows_open (struct serial *scb, const char *name)
 {
   struct pipe_state *ps;

+  FILE *pex_stderr;

 
   char **argv = buildargv (name);
   struct cleanup *back_to = make_cleanup_freeargv (argv);
 
   char **argv = buildargv (name);
   struct cleanup *back_to = make_cleanup_freeargv (argv);


@@ -717,7 +844,8 @@ pipe_windows_open (struct serial *scb, const char *name)
   {
     int err;
     const char *err_msg
   {
     int err;
     const char *err_msg

-      = pex_run (ps->pex, PEX_SEARCH | PEX_BINARY_INPUT | PEX_BINARY_OUTPUT,
+      = pex_run (ps->pex, PEX_SEARCH | PEX_BINARY_INPUT | PEX_BINARY_OUTPUT
+                | PEX_STDERR_TO_PIPE,

                  argv[0], argv, NULL, NULL,
                  &err);
 
                  argv[0], argv, NULL, NULL,
                  &err);
 


@@ -739,8 +867,13 @@ pipe_windows_open (struct serial *scb, const char *name)
   ps->output = pex_read_output (ps->pex, 1);
   if (! ps->output)
     goto fail;
   ps->output = pex_read_output (ps->pex, 1);
   if (! ps->output)
     goto fail;

-

   scb->fd = fileno (ps->output);
   scb->fd = fileno (ps->output);

+
+  pex_stderr = pex_read_err (ps->pex, 1);
+  if (! pex_stderr)
+    goto fail;
+  scb->error_fd = fileno (pex_stderr);
+

   scb->state = (void *) ps;
 
   discard_cleanups (back_to);
   scb->state = (void *) ps;
 
   discard_cleanups (back_to);


@@ -817,28 +950,8 @@ pipe_wait_handle (struct serial *scb, HANDLE *read, HANDLE *except)
 
   /* Have we allocated our events yet?  */
   if (ps->wait.read_event == INVALID_HANDLE_VALUE)
 
   /* Have we allocated our events yet?  */
   if (ps->wait.read_event == INVALID_HANDLE_VALUE)

-    {
-      DWORD threadId;
-
-      /* Create auto reset events to wake, stop, and exit the select
-        thread.  */
-      ps->wait.start_select = CreateEvent (0, FALSE, FALSE, 0);
-      ps->wait.stop_select = CreateEvent (0, FALSE, FALSE, 0);
-      ps->wait.exit_select = CreateEvent (0, FALSE, FALSE, 0);
-
-      /* Create a manual reset event to signal whether the thread is
-        stopped.  This must be manual reset, because we may wait on
-        it multiple times without ever starting the thread.  */
-      ps->wait.have_stopped = CreateEvent (0, TRUE, FALSE, 0);
-
-      /* Create our own events to report read and exceptions separately.
-        The exception event is currently never used.  */
-      ps->wait.read_event = CreateEvent (0, FALSE, FALSE, 0);
-      ps->wait.except_event = CreateEvent (0, FALSE, FALSE, 0);
-
-      /* Start the select thread.  */
-      CreateThread (NULL, 0, pipe_select_thread, scb, 0, &threadId);
-    }
+    /* Start the thread.  */
+    create_select_thread (pipe_select_thread, scb, &ps->wait);

 
   *read = ps->wait.read_event;
   *except = ps->wait.except_event;
 
   *read = ps->wait.read_event;
   *except = ps->wait.except_event;


@@ -848,8 +961,7 @@ pipe_wait_handle (struct serial *scb, HANDLE *read, HANDLE *except)
   ResetEvent (ps->wait.except_event);
   ResetEvent (ps->wait.stop_select);
 
   ResetEvent (ps->wait.except_event);
   ResetEvent (ps->wait.stop_select);
 

-  /* Start the select thread.  */
-  SetEvent (ps->wait.start_select);
+  start_select_thread (&ps->wait);

 }
 
 static void
 }
 
 static void


@@ -861,30 +973,32 @@ pipe_done_wait_handle (struct serial *scb)
   if (ps->wait.read_event == INVALID_HANDLE_VALUE)
     return;
 
   if (ps->wait.read_event == INVALID_HANDLE_VALUE)
     return;
 

-  SetEvent (ps->wait.stop_select);
-  WaitForSingleObject (ps->wait.have_stopped, INFINITE);
+  stop_select_thread (&ps->wait);

 }
 
 }
 

-struct net_windows_state
+static int
+pipe_avail (struct serial *scb, int fd)

 {
 {

-  HANDLE read_event;
-  HANDLE except_event;
-
-  HANDLE start_select;
-  HANDLE stop_select;
-  HANDLE exit_select;
-  HANDLE have_stopped;
+  HANDLE h = (HANDLE) _get_osfhandle (fd);
+  DWORD numBytes;
+  BOOL r = PeekNamedPipe (h, NULL, 0, NULL, &numBytes, NULL);
+  if (r == FALSE)
+    numBytes = 0;
+  return numBytes;
+}

 
 

+struct net_windows_state
+{
+  struct ser_console_state base;
+  

   HANDLE sock_event;
   HANDLE sock_event;

-
-  HANDLE thread;

 };
 
 static DWORD WINAPI
 net_windows_select_thread (void *arg)
 {
   struct serial *scb = arg;
 };
 
 static DWORD WINAPI
 net_windows_select_thread (void *arg)
 {
   struct serial *scb = arg;

-  struct net_windows_state *state, state_copy;
+  struct net_windows_state *state;

   int event_index;
 
   state = scb->state;
   int event_index;
 
   state = scb->state;


@@ -894,44 +1008,37 @@ net_windows_select_thread (void *arg)
       HANDLE wait_events[2];
       WSANETWORKEVENTS events;
 
       HANDLE wait_events[2];
       WSANETWORKEVENTS events;
 

-      SetEvent (state->have_stopped);
-
-      wait_events[0] = state->start_select;
-      wait_events[1] = state->exit_select;
+      select_thread_wait (&state->base);

 
 

-      if (WaitForMultipleObjects (2, wait_events, FALSE, INFINITE) != WAIT_OBJECT_0)
-       return 0;
-
-      ResetEvent (state->have_stopped);
-
-      wait_events[0] = state->stop_select;
+      wait_events[0] = state->base.stop_select;

       wait_events[1] = state->sock_event;
 
       event_index = WaitForMultipleObjects (2, wait_events, FALSE, INFINITE);
 
       if (event_index == WAIT_OBJECT_0
       wait_events[1] = state->sock_event;
 
       event_index = WaitForMultipleObjects (2, wait_events, FALSE, INFINITE);
 
       if (event_index == WAIT_OBJECT_0

-         || WaitForSingleObject (state->stop_select, 0) == WAIT_OBJECT_0)
-       continue;
-
-      if (event_index != WAIT_OBJECT_0 + 1)
+         || WaitForSingleObject (state->base.stop_select, 0) == WAIT_OBJECT_0)
+       /* We have been requested to stop.  */
+       ;
+      else if (event_index != WAIT_OBJECT_0 + 1)
+       /* Some error has occured.  Assume that this is an error
+          condition.  */
+       SetEvent (state->base.except_event);
+      else

        {
        {

-         /* Some error has occured.  Assume that this is an error
-            condition.  */
-         SetEvent (state->except_event);
-         continue;
+         /* Enumerate the internal network events, and reset the
+            object that signalled us to catch the next event.  */
+         WSAEnumNetworkEvents (scb->fd, state->sock_event, &events);
+         
+         gdb_assert (events.lNetworkEvents & (FD_READ | FD_CLOSE));
+         
+         if (events.lNetworkEvents & FD_READ)
+           SetEvent (state->base.read_event);
+         
+         if (events.lNetworkEvents & FD_CLOSE)
+           SetEvent (state->base.except_event);

        }
 
        }
 

-      /* Enumerate the internal network events, and reset the object that
-        signalled us to catch the next event.  */
-      WSAEnumNetworkEvents (scb->fd, state->sock_event, &events);
-
-      gdb_assert (events.lNetworkEvents & (FD_READ | FD_CLOSE));
-
-      if (events.lNetworkEvents & FD_READ)
-       SetEvent (state->read_event);
-
-      if (events.lNetworkEvents & FD_CLOSE)
-       SetEvent (state->except_event);
+      SetEvent (state->base.have_stopped);

     }
 }
 
     }
 }
 


@@ -941,12 +1048,12 @@ net_windows_wait_handle (struct serial *scb, HANDLE *read, HANDLE *except)
   struct net_windows_state *state = scb->state;
 
   /* Start from a clean slate.  */
   struct net_windows_state *state = scb->state;
 
   /* Start from a clean slate.  */

-  ResetEvent (state->read_event);
-  ResetEvent (state->except_event);
-  ResetEvent (state->stop_select);
+  ResetEvent (state->base.read_event);
+  ResetEvent (state->base.except_event);
+  ResetEvent (state->base.stop_select);

 
 

-  *read = state->read_event;
-  *except = state->except_event;
+  *read = state->base.read_event;
+  *except = state->base.except_event;

 
   /* Check any pending events.  This both avoids starting the thread
      unnecessarily, and handles stray FD_READ events (see below).  */
 
   /* Check any pending events.  This both avoids starting the thread
      unnecessarily, and handles stray FD_READ events (see below).  */


@@ -978,7 +1085,7 @@ net_windows_wait_handle (struct serial *scb, HANDLE *read, HANDLE *except)
          if (ioctlsocket (scb->fd, FIONREAD, &available) == 0
              && available > 0)
            {
          if (ioctlsocket (scb->fd, FIONREAD, &available) == 0
              && available > 0)
            {

-             SetEvent (state->read_event);
+             SetEvent (state->base.read_event);

              any = 1;
            }
          else
              any = 1;
            }
          else


@@ -992,7 +1099,7 @@ net_windows_wait_handle (struct serial *scb, HANDLE *read, HANDLE *except)
         still valid, and it will not be resignalled.  */
       if (events.lNetworkEvents & FD_CLOSE)
        {
         still valid, and it will not be resignalled.  */
       if (events.lNetworkEvents & FD_CLOSE)
        {

-         SetEvent (state->except_event);
+         SetEvent (state->base.except_event);

          any = 1;
        }
 
          any = 1;
        }
 


@@ -1001,8 +1108,7 @@ net_windows_wait_handle (struct serial *scb, HANDLE *read, HANDLE *except)
        return;
     }
 
        return;
     }
 

-  /* Start the select thread.  */
-  SetEvent (state->start_select);
+  start_select_thread (&state->base);

 }
 
 static void
 }
 
 static void


@@ -1010,8 +1116,7 @@ net_windows_done_wait_handle (struct serial *scb)
 {
   struct net_windows_state *state = scb->state;
 
 {
   struct net_windows_state *state = scb->state;
 

-  SetEvent (state->stop_select);
-  WaitForSingleObject (state->have_stopped, INFINITE);
+  stop_select_thread (&state->base);

 }
 
 static int
 }
 
 static int


@@ -1029,28 +1134,12 @@ net_windows_open (struct serial *scb, const char *name)
   memset (state, 0, sizeof (struct net_windows_state));
   scb->state = state;
 
   memset (state, 0, sizeof (struct net_windows_state));
   scb->state = state;
 

-  /* Create auto reset events to wake, stop, and exit the select
-     thread.  */
-  state->start_select = CreateEvent (0, FALSE, FALSE, 0);
-  state->stop_select = CreateEvent (0, FALSE, FALSE, 0);
-  state->exit_select = CreateEvent (0, FALSE, FALSE, 0);
-
-  /* Create a manual reset event to signal whether the thread is
-     stopped.  This must be manual reset, because we may wait on
-     it multiple times without ever starting the thread.  */
-  state->have_stopped = CreateEvent (0, TRUE, FALSE, 0);
-

   /* Associate an event with the socket.  */
   state->sock_event = CreateEvent (0, TRUE, FALSE, 0);
   WSAEventSelect (scb->fd, state->sock_event, FD_READ | FD_CLOSE);
 
   /* Associate an event with the socket.  */
   state->sock_event = CreateEvent (0, TRUE, FALSE, 0);
   WSAEventSelect (scb->fd, state->sock_event, FD_READ | FD_CLOSE);
 

-  /* Create our own events to report read and close separately.  */
-  state->read_event = CreateEvent (0, FALSE, FALSE, 0);
-  state->except_event = CreateEvent (0, FALSE, FALSE, 0);
-
-  /* And finally start the select thread.  */
-  state->thread = CreateThread (NULL, 0, net_windows_select_thread, scb, 0,
-                               &threadId);
+  /* Start the thread.  */
+  create_select_thread (net_windows_select_thread, scb, &state->base);

 
   return 0;
 }
 
   return 0;
 }


@@ -1061,17 +1150,7 @@ net_windows_close (struct serial *scb)
 {
   struct net_windows_state *state = scb->state;
 
 {
   struct net_windows_state *state = scb->state;
 

-  SetEvent (state->exit_select);
-  WaitForSingleObject (state->thread, INFINITE);
-
-  CloseHandle (state->read_event);
-  CloseHandle (state->except_event);
-
-  CloseHandle (state->start_select);
-  CloseHandle (state->stop_select);
-  CloseHandle (state->exit_select);
-  CloseHandle (state->have_stopped);
-
+  destroy_select_thread (&state->base);

   CloseHandle (state->sock_event);
 
   xfree (scb->state);
   CloseHandle (state->sock_event);
 
   xfree (scb->state);


@@ -1164,6 +1243,7 @@ _initialize_ser_windows (void)
   ops->write_prim = pipe_windows_write;
   ops->wait_handle = pipe_wait_handle;
   ops->done_wait_handle = pipe_done_wait_handle;
   ops->write_prim = pipe_windows_write;
   ops->wait_handle = pipe_wait_handle;
   ops->done_wait_handle = pipe_done_wait_handle;

+  ops->avail = pipe_avail;

 
   serial_add_interface (ops);
 
 
   serial_add_interface (ops);