JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler_termios.cc (fhandler_termios::line_edit): Don't manipulate

Browse Source 
output_mutex on CTRL-S/CTRL-Q to avoid a deadlock.
* fhandler_tty.cc (fhandler_pty_slave::write): Loop when output_stopped is
detected before acquiring output_mutex.  Acquire output_mutex in the loop for
each write.
* tty.h: Remove some obsolete defines.
(tty_min::output_stopped): Make 'bool'.
This commit is contained in:
Christopher Faylor
2012-10-12 01:19:04 +00:00
parent 52985c1686
commit fe0cb31137
4 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
winsup/cygwin/fhandler_tty.cc
View File

@@ -645,8 +645,6 @@ fhandler_pty_slave::write (const void *ptr, size_t len)
push_process_state process_state (PID_TTYOU);
acquire_output_mutex (INFINITE);
while (len)
{
n = MIN (OUT_BUFFER_SIZE, len);
@@ -654,6 +652,10 @@ fhandler_pty_slave::write (const void *ptr, size_t len)
ptr = (char *) ptr + n;
len -= n;
while (tc ()->output_stopped)
cygwait (10);
acquire_output_mutex (INFINITE);
/* Previous write may have set write_error to != 0. Check it here.
This is less than optimal, but the alternative slows down pty
writes enormously. */
@@ -664,7 +666,9 @@ fhandler_pty_slave::write (const void *ptr, size_t len)
break;
}
if (WriteFile (get_output_handle (), buf, n, &n, NULL) == FALSE)
DWORD res = WriteFile (get_output_handle (), buf, n, &n, NULL);
release_output_mutex ();
if (!res)
{
DWORD err = GetLastError ();
termios_printf ("WriteFile failed, %E");
@@ -677,10 +681,10 @@ fhandler_pty_slave::write (const void *ptr, size_t len)
}
raise (SIGHUP); /* FIXME: Should this be SIGTTOU? */
towrite = (DWORD) -1;
release_output_mutex ();
break;
}
}
release_output_mutex ();
return towrite;
}