aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Yano <takashi.yano@nifty.ne.jp>2022-02-10 17:22:11 +0900
committerTakashi Yano <takashi.yano@nifty.ne.jp>2022-02-13 23:55:59 +0900
commitbddd9c1c417e97791c44241cf94753e90464501c (patch)
treec19d07f19a2b4276559fa4cf01a72817365ad989
parentb04aea00f1bb503dcc364c83ee3ef3da3bc1305e (diff)
downloadnewlib-bddd9c1c417e97791c44241cf94753e90464501c.zip
newlib-bddd9c1c417e97791c44241cf94753e90464501c.tar.gz
newlib-bddd9c1c417e97791c44241cf94753e90464501c.tar.bz2
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.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 7bef695..7e065c4 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