diff options
| author | Takashi Yano <takashi.yano@nifty.ne.jp> | 2022-02-10 11:22:11 +0300 |
|---|---|---|
| committer | Takashi Yano <takashi.yano@nifty.ne.jp> | 2022-02-13 18:03:19 +0300 |
| commit | c00d44595801b98848bc27b3bf30b0b390df9e42 (patch) | |
| tree | 373e40f8f565c89bdb9719e46ef94bb481317c5b | |
| parent | 7e2f56a906a6622302b6a9398541b459505c7862 (diff) | |
Cygwin: pty: Prevent deadlock on echo output.
- If the slave process writes a lot of text output, doecho() can
cause deadlock. This is because output_mutex is held in slave::
write() and if WriteFile() is blocked due to pipe full, doecho()
tries to acquire output_mutex and gets into deadlock. With this
patch, the deadlock is prevented on the sacrifice of atomicity
of doecho().
| -rw-r--r-- | winsup/cygwin/fhandler_tty.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 7bef6958c..7e065c46a 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -496,11 +496,9 @@ void fhandler_pty_master::doecho (const void *str, DWORD len) { ssize_t towrite = len; - acquire_output_mutex (mutex_timeout); if (!process_opost_output (echo_w, str, towrite, true, get_ttyp (), is_nonblocking ())) termios_printf ("Write to echo pipe failed, %E"); - release_output_mutex (); } int |