* 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.
This commit is contained in:
parent
57aac4bf26
commit
b66dba56c5
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 ())
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue