* fhandler.h (fhandler_dev_dsp): Cosmetic change.

* fhandler_tty.cc (fhandler_pty_master::process_slave_output): Put back
Sleep(10) for tty_master case.
* sigproc.cc (stopped_or_terminated): Don't consider a pid which has been
reaped to be terminated.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 7a974169078b6a140f26ca51502a93fac0d7f116..d04e8c2ad1797f4df14d949f6f0efefc154e46bd 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,13 @@
+2011-05-06  Christopher Faylor  <me.cygwin2011@cgf.cx>
+
+       * fhandler.h (fhandler_dev_dsp): Cosmetic change.
+
+       * fhandler_tty.cc (fhandler_pty_master::process_slave_output): Put back
+       Sleep(10) for tty_master case.
+
+       * sigproc.cc (stopped_or_terminated): Don't consider a pid which has
+       been reaped to be terminated.
+
 2011-05-06  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
 
        * sysconf.cc (sysinfo): New function.

diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 2dcbd9d8f3c49955926dc2d2de9b91426f3eb8a9..1c066ff64974ccd1d1f453e54ba3387fa961bac3 100644 (file)
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -1389,8 +1389,8 @@ class fhandler_dev_dsp: public fhandler_base
  private:
   void close_audio_in ();
   void close_audio_out (bool immediately = false);
-  size_t size () const { return sizeof (*this);}
   bool use_archetype () const {return true;}
+  size_t size () const { return sizeof (*this);}
 };
 
 class fhandler_virtual : public fhandler_base

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 42e53919134fa607b292c3197d5c935d0055b3de..5665fc84523d9429a7002f10d730307f6a00b231 100644 (file)
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -312,7 +312,10 @@ fhandler_pty_master::process_slave_output (char *buf, size_t len, int pktmode_on
                goto out;
 
              if (is_tty_master ())
-               continue;
+               {
+                 Sleep (10);
+                 continue;
+               }
 
              if (is_nonblocking ())
                {

diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
index 8a6559f55a036eebfcdb5a5aa0f1de3397c2ca97..43655dc4c29a717f3be717c2b26e7fd846933583 100644 (file)
--- a/winsup/cygwin/sigproc.cc
+++ b/winsup/cygwin/sigproc.cc
@@ -1022,7 +1022,7 @@ stopped_or_terminated (waitq *parent_w, _pinfo *child)
 
   int terminated;
 
-  if (!((terminated = (child->process_state & (PID_REAPED | PID_EXITED)))
+  if (!((terminated = (child->process_state == PID_EXITED))
        || ((w->options & WCONTINUED) && child->stopsig == SIGCONT)
        || ((w->options & WUNTRACED) && child->stopsig && child->stopsig != SIGCONT)))
     return false;