f1413819a4
These hacks were proposed in Cygwin as a more complete set of workarounds superseding Git for Windows' https://github.com/git-for-windows/msys2-runtime/commit/1d0701d This commit corresponds to https://github.com/msys2/msys2-runtime/pull/86 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 9d5dfc73fd91cffbd4b4de0cb969e6e474072de4 Mon Sep 17 00:00:00 2001
|
|
From: Takashi Yano <takashi.yano@nifty.ne.jp>
|
|
Date: Thu, 10 Feb 2022 17:22:11 +0900
|
|
Subject: [PATCH 39/N] 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().
|
|
---
|
|
winsup/cygwin/fhandler_tty.cc | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
|
|
index 10566ac..c1c2c1d 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
|
|
--
|
|
2.35.1
|
|
|